4 files changed, 17 insertions, 12 deletions

diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index 859268a0..9942300c 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -519,10 +519,12 @@ exports.Ninja = Montage.create(Component, {
 //                background =  "#000000";
 //                overflow = "hidden";
                 transitionStopRule = "nj-css-garbage-selector";
+                this.stage.bindingView.hide = true;
             } else {
 //                background =  "#808080";
 //                overflow = "visible";
                 transitionStopRule = "*"
+                this.stage.bindingView.hide = false;
             }
 
             // TODO: Remove marker for old template: NINJA-STAGE-REWORK
diff --git a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js
index 0f1b99c9..6b802cb0 100755
--- a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js
+++ b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js
@@ -76,12 +76,7 @@ exports.BindingHud = Montage.create(Component, {
                 this.title = icon.name;
                 this.x = iconOffsets.x;
                 this.y = iconOffsets.y - 80;
-            } else {
-                this.title = val.identifier;
-                this.x = val.element.offsetLeft;
-                this.y = val.element.offsetTop;
             }
-
             this.needsDraw = true;
 
         }
@@ -236,6 +231,12 @@ exports.BindingHud = Montage.create(Component, {
                 this.scrollUp.style.display = "block";
                 this.scrollDown.style.display = "block";
             }
+            var isOffStage = this.application.ninja.objectsController.isOffStageObject(this.userComponent);
+            if(!isOffStage) {
+                this.title = this.userComponent.identifier;
+                this.x = this.userComponent.element.offsetLeft;
+                this.y = this.userComponent.element.offsetTop;
+            }
         }
     },
 
@@ -323,6 +324,12 @@ exports.BindingHud = Montage.create(Component, {
         }
     },
 
+    willDraw: {
+        value: function() {
+
+        }
+    },
+
     draw: {
         value: function() {
             this.titleElement.innerHTML = this.title;
diff --git a/js/stage/binding-view.reel/binding-view.js b/js/stage/binding-view.reel/binding-view.js
index 1fc4d583..94c84d02 100755
--- a/js/stage/binding-view.reel/binding-view.js
+++ b/js/stage/binding-view.reel/binding-view.js
@@ -198,7 +198,7 @@ exports.BindingView = Montage.create(Component, {
         }
     },
 
-    _hide : { value: null },
+    _hide : { value: true },
     hide : {
         get : function() { return this._hide; },
         set : function(value) {
@@ -247,12 +247,6 @@ exports.BindingView = Montage.create(Component, {
         }
     },
 
-    didDraw: {
-        value: function() {
-
-        }
-    },
-
     drawLine: {
         value: function(fromX,fromY,toX,toY, color, width) {
             if(width === null) width = 1;
diff --git a/js/tools/bindingTool.js b/js/tools/bindingTool.js
index 1e1c9e5b..3f8e960f 100644
--- a/js/tools/bindingTool.js
+++ b/js/tools/bindingTool.js
@@ -33,6 +33,7 @@ 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;
@@ -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;
             }
 
         }