Merge branch 'refs/heads/ninja-internal' into WebGLMaterials

2 files changed, 15 insertions, 24 deletions

diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js
index 48548271..37029e8c 100755
--- a/js/tools/SelectionTool.js
+++ b/js/tools/SelectionTool.js
@@ -115,8 +115,7 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
     HandleLeftButtonUp: {
         value: function(event) {
             var selectedItems,
-                point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas,
-                                                                    new WebKitPoint(event.pageX, event.pageY));
+                point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(event.pageX, event.pageY));
 
             this.isDrawing = false;
             this.application.ninja.stage.showSelectionBounds = true;
@@ -184,28 +183,21 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
         }
     },
 
+    /**
+     * Double click handler
+     *
+     * Sets the currentSelectionContainer to the current selected element. If no elements are selected set the
+     * currentSelectionContainer to the userDocument div.
+     */
     HandleDoubleClick: {
-            value: function(event) {
-                /*
-                var selectedObject = stageManagerModule.stageManager.GetObjectFromPoint(event.layerX, event.layerY, this._canOperateOnStage);
-
-                if(selectedObject) {
-                    if(selectionManagerModule.selectionManager.findSelectedElement(selectedObject) === -1) {
-                        selectionManagerModule.selectionManager.setSingleSelection(selectedObject);
-                    }
-                }
-                */
-
-                // Temporary Code for Breadcrumb
-                if(this.application.ninja.selectedElements.length > 0) {
-                    this.application.ninja.currentSelectedContainer = this.application.ninja.selectedElements[0]._element;
-                } else {
-                    console.log(this.application.ninja.currentDocument.documentRoot.uuid);
-                    this.application.ninja.currentSelectedContainer = this.application.ninja.currentDocument.documentRoot;
-                }
-
+        value: function(event) {
+            if(this.application.ninja.selectedElements.length > 0) {
+                this.application.ninja.currentSelectedContainer = this.application.ninja.selectedElements[0]._element;
+            } else {
+                this.application.ninja.currentSelectedContainer = this.application.ninja.currentDocument.documentRoot;
             }
-        },
+        }
+    },
 
     HandleKeyPress: {
         value: function(event){
diff --git a/js/tools/modifier-tool-base.js b/js/tools/modifier-tool-base.js
index 67377ab3..7d946cb0 100755
--- a/js/tools/modifier-tool-base.js
+++ b/js/tools/modifier-tool-base.js
@@ -791,8 +791,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
     HandleLeftButtonDown: {
         value: function(event) {
 
-            var point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas,
-                                                        new WebKitPoint(event.pageX, event.pageY));
+            var point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(event.pageX, event.pageY));
             this.downPoint.x = point.x;
             this.downPoint.y = point.y;