Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local

1 files changed, 7 insertions, 11 deletions

diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js
index 34b3615b..a8da7921 100755
--- a/js/tools/ShapeTool.js
+++ b/js/tools/ShapeTool.js
@@ -6,8 +6,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 
 var Montage = require("montage/core/core").Montage,
     DrawingTool = require("js/tools/drawing-tool").DrawingTool,
-    viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils,
-    drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils,
     NJUtils = require("js/lib/NJUtils").NJUtils,
     ShapesController = require("js/controllers/elements/shapes-controller").ShapesController,
     ShapeModel    = require("js/models/shape-model").ShapeModel,
@@ -67,7 +65,8 @@ exports.ShapeTool = Montage.create(DrawingTool, {
                 var canvas;
                 if(!this._useExistingCanvas()) {
                     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);
+                    var elementModel = TagTool.makeElement(~~drawData.width, ~~drawData.height,
+                                                                        drawData.planeMat, drawData.midPt, canvas, true);
 
                     canvas.elementModel.isShape = true;
                     this.application.ninja.elementMediator.addElements(canvas, elementModel.data);
@@ -122,7 +121,7 @@ exports.ShapeTool = Montage.create(DrawingTool, {
         RemoveCustomFeedback: {
                 value: function (event) {
                         if (this._targetedElement) {
-                this._targetedElement.classList.remove("elem-red-outline");
+                this._targetedElement.classList.remove("active-element-outline");
                                 this._targetedElement = null;
                         }
 
@@ -139,23 +138,22 @@ exports.ShapeTool = Montage.create(DrawingTool, {
         _showFeedbackOnMouseMove: {
                 value: function (event) {
                         // TODO - This call is causing the canvas to redraw 3 times per mouse move
-                        var targetedObject = this.application.ninja.stage.GetElement(event);
+                        var targetedObject = this.application.ninja.stage.GetSelectableElement(event);
 
                         if (targetedObject) {
-                                // TODO - Clean this up
                                 if((targetedObject.nodeName === "CANVAS") && !ShapesController.isElementAShape(targetedObject))
                                 {
                                         if (targetedObject !== this._targetedElement) {
                                                 if(this._targetedElement)
                                                 {
-                            this._targetedElement.classList.remove("elem-red-outline");
+                            this._targetedElement.classList.remove("active-element-outline");
                                                 }
                                                 this._targetedElement = targetedObject;
-                        this._targetedElement.classList.add("elem-red-outline");
+                        this._targetedElement.classList.add("active-element-outline");
                                         }
                                 }
                                 else if (this._targetedElement) {
-                                        this._targetedElement.classList.remove("elem-red-outline");
+                                        this._targetedElement.classList.remove("active-element-outline");
                                         this._targetedElement = null;
                                 }
                         }
@@ -209,8 +207,6 @@ exports.ShapeTool = Montage.create(DrawingTool, {
         }
     },
 
-
-
         // We can draw on an existing canvas unless it has only a single shape object
         _useExistingCanvas: {
                 value: function()