Merge branch 'refs/heads/Jose-Document' into Document

5 files changed, 0 insertions, 41 deletions

diff --git a/js/tools/Rotate3DToolBase.js b/js/tools/Rotate3DToolBase.js
index e36e23c4..545aedad 100755
--- a/js/tools/Rotate3DToolBase.js
+++ b/js/tools/Rotate3DToolBase.js
@@ -485,7 +485,6 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
                 if(len === 1)
                 {
                     this.target = this.application.ninja.selectedElements[0];
-                    drawUtils.addElement(this.target);
 
                     viewUtils.pushViewportObj( this.target );
                     var eltCtr = viewUtils.getCenterOfProjection();
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js
index 923ed819..a136113b 100755
--- a/js/tools/SelectionTool.js
+++ b/js/tools/SelectionTool.js
@@ -102,7 +102,6 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
             }
 
             this.isDrawing = true;
-            this.application.ninja.stage.showSelectionBounds = false;
 
             this._use3DMode = false;
 
@@ -183,7 +182,6 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
                 point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(event.pageX, event.pageY));
 
             this.isDrawing = false;
-            this.application.ninja.stage.showSelectionBounds = true;
             if(this._escape) {
                 this._escape = false;
                 this._isSelecting = false;
diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js
index 26ed9c6f..ecc0dca3 100755
--- a/js/tools/ShapeTool.js
+++ b/js/tools/ShapeTool.js
@@ -70,7 +70,6 @@ exports.ShapeTool = Montage.create(DrawingTool, {
                 this.doDraw(event);
             } else {
                 this.doSnap(event);
-                this._showFeedbackOnMouseMove(event);
             }
 
             this.drawLastSnap();        // Required cleanup for both Draw/Feedbacks
@@ -159,39 +158,6 @@ exports.ShapeTool = Montage.create(DrawingTool, {
         }
     },
 
-    /** Show a border when mousing
-     * over existing canvas elements to signal to the user that
-     * the drawing operation will act on the targeted canvas.
-    **/
-    _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, true);
-
-            if (targetedObject) {
-                if((targetedObject.nodeName === "CANVAS") && !ShapesController.isElementAShape(targetedObject))
-                {
-                    if (targetedObject !== this._targetedElement) {
-                        if(this._targetedElement)
-                        {
-                            this._targetedElement.classList.remove("active-element-outline");
-                        }
-                        this._targetedElement = targetedObject;
-                        this._targetedElement.classList.add("active-element-outline");
-                    }
-                }
-                else if (this._targetedElement) {
-                    this._targetedElement.classList.remove("active-element-outline");
-                    this._targetedElement = null;
-                }
-            }
-            else if (this._targetedElement) {
-                this._targetedElement.classList.remove("elem-red-outline");
-                this._targetedElement = null;
-            }
-        }
-    },
-
     RenderShape:
     {
         value: function (w, h, planeMat, midPt)
diff --git a/js/tools/Translate3DToolBase.js b/js/tools/Translate3DToolBase.js
index 57a379e4..b5008666 100755
--- a/js/tools/Translate3DToolBase.js
+++ b/js/tools/Translate3DToolBase.js
@@ -302,7 +302,6 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
             if(len) {
                 if(len === 1) {
                     this.target = this.application.ninja.selectedElements[0];
-                    drawUtils.addElement(this.target);
 
                     viewUtils.pushViewportObj( this.target );
                     var eltCtr = viewUtils.getCenterOfProjection();
diff --git a/js/tools/modifier-tool-base.js b/js/tools/modifier-tool-base.js
index 9b855e66..c772e36c 100755
--- a/js/tools/modifier-tool-base.js
+++ b/js/tools/modifier-tool-base.js
@@ -480,7 +480,6 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
             if(this._target)
             {
                 this.isDrawing = true;
-                this.application.ninja.stage.showSelectionBounds = false;
                 this._updateTargets();
 
                 if(this._canSnap)
@@ -798,7 +797,6 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
                 if(len === 1)
                 {
                     this.target = this.application.ninja.selectedElements[0];
-                    drawUtils.addElement(this.target);
                 }
                 else
                 {
@@ -882,7 +880,6 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
                                                                     new WebKitPoint(event.pageX, event.pageY));
 
             this.isDrawing = false;
-            this.application.ninja.stage.showSelectionBounds = true;
             if(this._escape) {
                 this._escape = false;
                 return;