diff options
-rwxr-xr-x | js/ninja.reel/ninja.js | 2 | ||||
-rwxr-xr-x | js/stage/binding-view.reel/binding-view.js | 8 | ||||
-rw-r--r-- | js/tools/bindingTool.js | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index f1825b9a..0b7748e5 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js | |||
@@ -519,10 +519,12 @@ exports.Ninja = Montage.create(Component, { | |||
519 | // background = "#000000"; | 519 | // background = "#000000"; |
520 | // overflow = "hidden"; | 520 | // overflow = "hidden"; |
521 | transitionStopRule = "nj-css-garbage-selector"; | 521 | transitionStopRule = "nj-css-garbage-selector"; |
522 | this.stage.bindingView.hide = true; | ||
522 | } else { | 523 | } else { |
523 | // background = "#808080"; | 524 | // background = "#808080"; |
524 | // overflow = "visible"; | 525 | // overflow = "visible"; |
525 | transitionStopRule = "*" | 526 | transitionStopRule = "*" |
527 | this.stage.bindingView.hide = false; | ||
526 | } | 528 | } |
527 | 529 | ||
528 | // TODO: Remove marker for old template: NINJA-STAGE-REWORK | 530 | // TODO: Remove marker for old template: NINJA-STAGE-REWORK |
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, { | |||
198 | } | 198 | } |
199 | }, | 199 | }, |
200 | 200 | ||
201 | _hide : { value: null }, | 201 | _hide : { value: true }, |
202 | hide : { | 202 | hide : { |
203 | get : function() { return this._hide; }, | 203 | get : function() { return this._hide; }, |
204 | set : function(value) { | 204 | set : function(value) { |
@@ -247,12 +247,6 @@ exports.BindingView = Montage.create(Component, { | |||
247 | } | 247 | } |
248 | }, | 248 | }, |
249 | 249 | ||
250 | didDraw: { | ||
251 | value: function() { | ||
252 | |||
253 | } | ||
254 | }, | ||
255 | |||
256 | drawLine: { | 250 | drawLine: { |
257 | value: function(fromX,fromY,toX,toY, color, width) { | 251 | value: function(fromX,fromY,toX,toY, color, width) { |
258 | if(width === null) width = 1; | 252 | 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, { | |||
33 | { | 33 | { |
34 | NJevent("enableStageMove"); | 34 | NJevent("enableStageMove"); |
35 | this.application.ninja.workspaceMode = "binding"; | 35 | this.application.ninja.workspaceMode = "binding"; |
36 | this.application.ninja.stage.bindingView.hide = false; | ||
36 | if (this.application.ninja.selectedElements.length !== 0 ) { | 37 | if (this.application.ninja.selectedElements.length !== 0 ) { |
37 | if(typeof(this.application.ninja.selectedElements[0].controller) !== "undefined") { | 38 | if(typeof(this.application.ninja.selectedElements[0].controller) !== "undefined") { |
38 | this.selectedComponent = this.application.ninja.selectedElements[0].controller; | 39 | this.selectedComponent = this.application.ninja.selectedElements[0].controller; |
@@ -47,6 +48,7 @@ exports.BindingTool = Montage.create(ModifierToolBase, { | |||
47 | NJevent("disableStageMove"); | 48 | NJevent("disableStageMove"); |
48 | this.application.ninja.workspaceMode = "default"; | 49 | this.application.ninja.workspaceMode = "default"; |
49 | this.selectedComponent = null; | 50 | this.selectedComponent = null; |
51 | this.application.ninja.stage.bindingView.hide = true; | ||
50 | } | 52 | } |
51 | 53 | ||
52 | } | 54 | } |