Merge branch 'refs/heads/Ninja-Internal' into Document

1 files changed, 11 insertions, 9 deletions

diff --git a/js/tools/bindingTool.js b/js/tools/bindingTool.js
index 1e1c9e5b..3704a451 100644
--- a/js/tools/bindingTool.js
+++ b/js/tools/bindingTool.js
@@ -12,17 +12,17 @@ SelectionTool = require("js/tools/SelectionTool").SelectionTool;
 
 exports.BindingTool = Montage.create(ModifierToolBase, {
     drawingFeedback: { value: { mode: "Draw2D", type: "" } },
-    _selectedComponent: {
+    _selectedElement: {
         value: null
     },
 
-    selectedComponent: {
+    selectedElement: {
         get:function() {
-            return this._selectedComponent;
+            return this._selectedElement;
         },
         set: function(val) {
-            this._selectedComponent = val;
-            this.application.ninja.stage.bindingView.selectedComponent = val;
+            this._selectedElement = val;
+            this.application.ninja.stage.bindingView.selectedElement = val;
         }
     },
 
@@ -33,9 +33,10 @@ exports.BindingTool = Montage.create(ModifierToolBase, {
             {
                 NJevent("enableStageMove");
                 this.application.ninja.workspaceMode = "binding";
+                this.application.ninja.stage.bindingView.hide = false;
                 if (this.application.ninja.selectedElements.length !== 0 ) {
                     if(typeof(this.application.ninja.selectedElements[0].controller) !== "undefined") {
-                        this.selectedComponent = this.application.ninja.selectedElements[0].controller;
+                        this.selectedElement = this.application.ninja.selectedElements[0];
                     } else {
                         this.selectedComponent = null;
                     }
@@ -47,6 +48,7 @@ exports.BindingTool = Montage.create(ModifierToolBase, {
                 NJevent("disableStageMove");
                 this.application.ninja.workspaceMode = "default";
                 this.selectedComponent = null;
+                this.application.ninja.stage.bindingView.hide = true;
             }
 
         }
@@ -85,12 +87,12 @@ exports.BindingTool = Montage.create(ModifierToolBase, {
                     this.doSelection(event);
                     if (this.application.ninja.selectedElements.length !== 0 ) {
                         if(this.application.ninja.selectedElements[0].controller) {
-                            this.selectedComponent = this.application.ninja.selectedElements[0].controller;
+                            this.selectedElement = this.application.ninja.selectedElements[0];
                         } else {
-                            this.selectedComponent = null;
+                            this.selectedElement = null;
                         }
                     } else {
-                        this.selectedComponent = null;
+                        this.selectedElement = null;
                     }
                     this._isDrawing = false;
                 }