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/OvalTool.js  |  2 +-
 js/tools/ShapeTool.js | 22 ++++++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'js/tools')

diff --git a/js/tools/OvalTool.js b/js/tools/OvalTool.js
index e8e88d1d..6edec811 100755
--- a/js/tools/OvalTool.js
+++ b/js/tools/OvalTool.js
@@ -66,7 +66,7 @@ exports.OvalTool = Montage.create(ShapeTool, {
             var world = this.getGLWorld(canvas, this.options.use3D);
 
             var xOffset = ((left - canvas.offsetLeft + w/2) - canvas.width/2);
-            var yOffset = (canvas.height/2 - (top - canvas.offsetTop + h/2));
+            var yOffset = -(canvas.height/2 - (top - canvas.offsetTop + h/2));
 
             var oval = new Circle(); //GLCircle();
             oval.init(world, xOffset, yOffset, w, h, strokeSize, strokeColor, fillColor, innerRadius, strokeMaterial, fillMaterial, strokeStyle);
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