From 27c1ba250a7db26cf24dd456d20af9ff1649e638 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Mon, 23 Apr 2012 17:04:48 -0700
Subject: canvas interaction

---
 js/tools/ShapeTool.js | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'js/tools/ShapeTool.js')

diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js
index f3b5e92d..b2948fe7 100755
--- a/js/tools/ShapeTool.js
+++ b/js/tools/ShapeTool.js
@@ -54,9 +54,9 @@ exports.ShapeTool = Montage.create(DrawingTool, {
     },
 
 	HandleLeftButtonUp:
-	{
-		value: function (event)
-		{
+    {
+        value: function (event)
+        {
             var drawData;
 
             drawData = this.getDrawingData();
@@ -69,24 +69,26 @@ exports.ShapeTool = Montage.create(DrawingTool, {
                                                                         drawData.planeMat, drawData.midPt, canvas, true);
 
                     canvas.elementModel.isShape = true;
-                    this.application.ninja.elementMediator.addElements(canvas, elementModel.data);
                 } else {
                     canvas = this._targetedElement;
+                    if (!canvas.getAttribute( "data-RDGE-id" ))
+                        canvas.setAttribute( "data-RDGE-id", NJUtils.generateRandom() );
                     canvas.elementModel.controller = ShapesController;
                     if(!canvas.elementModel.shapeModel) {
                         canvas.elementModel.shapeModel = Montage.create(ShapeModel);
                     }
                 }
+                this.application.ninja.elementMediator.addElements(canvas, canvas.elementModel.data);
             }
 
-			this.endDraw(event);
+            this.endDraw(event);
 
-			this._isDrawing = false;
-			this._hasDraw=false;
+            this._isDrawing = false;
+            this._hasDraw=false;
 
-			this.DrawHandles();
-		}
-	},
+            this.DrawHandles();
+        }
+    },
 
     onAddElements: {
         value: function(el) {
-- 
cgit v1.2.3


From 4b83774cdbfbf30add9a8fa2f11b1c4ff35179fa Mon Sep 17 00:00:00 2001
From: hwc487
Date: Thu, 26 Apr 2012 12:50:57 -0700
Subject: canvas interaction

---
 js/tools/ShapeTool.js | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'js/tools/ShapeTool.js')

diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js
index b2948fe7..74e692b6 100755
--- a/js/tools/ShapeTool.js
+++ b/js/tools/ShapeTool.js
@@ -69,6 +69,7 @@ exports.ShapeTool = Montage.create(DrawingTool, {
                                                                         drawData.planeMat, drawData.midPt, canvas, true);
 
                     canvas.elementModel.isShape = true;
+					this.application.ninja.elementMediator.addElements(canvas, elementModel.data);
                 } else {
                     canvas = this._targetedElement;
                     if (!canvas.getAttribute( "data-RDGE-id" ))
@@ -77,8 +78,8 @@ exports.ShapeTool = Montage.create(DrawingTool, {
                     if(!canvas.elementModel.shapeModel) {
                         canvas.elementModel.shapeModel = Montage.create(ShapeModel);
                     }
+					this.application.ninja.elementMediator.addElements(canvas, canvas.elementModel.data);
                 }
-                this.application.ninja.elementMediator.addElements(canvas, canvas.elementModel.data);
             }
 
             this.endDraw(event);
@@ -213,7 +214,20 @@ exports.ShapeTool = Montage.create(DrawingTool, {
 	_useExistingCanvas: {
 		value: function()
 		{
-			return (this._targetedElement && !ShapesController.isElementAShape(this._targetedElement));
+			var target;
+			if (this._targetedElement && (this._targetedElement.nodeName === "CANVAS") && !ShapesController.isElementAShape(this._targetedElement))
+				target = this._targetedElement;
+			else
+			{
+				var container = this.application.ninja.currentSelectedContainer;
+				if (container && (container.nodeName === "CANVAS"))
+				{
+					target = container;
+					this._targetedElement = target;
+				}
+			}
+
+			return target;
 		}
 	}
 
-- 
cgit v1.2.3


From e73fba18b095f0c270f5d954e5993c155b488c73 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Fri, 27 Apr 2012 13:52:40 -0700
Subject: Creating shapes in a container

---
 js/tools/ShapeTool.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'js/tools/ShapeTool.js')

diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js
index 74e692b6..90b403a4 100755
--- a/js/tools/ShapeTool.js
+++ b/js/tools/ShapeTool.js
@@ -64,6 +64,7 @@ exports.ShapeTool = Montage.create(DrawingTool, {
             if(drawData) {
                 var canvas;
                 if(!this._useExistingCanvas()) {
+					console.log( "creating a new canvas" );
                     canvas = NJUtils.makeNJElement("canvas", "Canvas", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true);
                     var elementModel = TagTool.makeElement(~~drawData.width, ~~drawData.height,
                                                                         drawData.planeMat, drawData.midPt, canvas, true);
@@ -71,6 +72,7 @@ exports.ShapeTool = Montage.create(DrawingTool, {
                     canvas.elementModel.isShape = true;
 					this.application.ninja.elementMediator.addElements(canvas, elementModel.data);
                 } else {
+					console.log( "inserting shape into container" );
                     canvas = this._targetedElement;
                     if (!canvas.getAttribute( "data-RDGE-id" ))
                         canvas.setAttribute( "data-RDGE-id", NJUtils.generateRandom() );
-- 
cgit v1.2.3