diff options
author | Jon Reid | 2012-03-15 15:01:15 -0700 |
---|---|---|
committer | Jon Reid | 2012-03-15 15:01:15 -0700 |
commit | 75dd0a2d333be1448f3f8bc0edd10f1c9199f84c (patch) | |
tree | f3a157f8cd92a8defb47edc68d8881db46f20586 /js/controllers | |
parent | 21c941bd1fe55e511a72bfa5dc3019748158bd4a (diff) | |
parent | 68d82cb56cb0235599c46caf349f328f15300fdf (diff) | |
download | ninja-75dd0a2d333be1448f3f8bc0edd10f1c9199f84c.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-local
Diffstat (limited to 'js/controllers')
-rwxr-xr-x | js/controllers/selection-controller.js | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js index c713b6e5..154fb7f8 100755 --- a/js/controllers/selection-controller.js +++ b/js/controllers/selection-controller.js | |||
@@ -90,15 +90,11 @@ exports.SelectionController = Montage.create(Component, { | |||
90 | } | 90 | } |
91 | }, | 91 | }, |
92 | 92 | ||
93 | handleSwitchDocument: { | 93 | handleSwitchDocument: { |
94 | value: function() { | 94 | value: function() { |
95 | if(this.application.ninja.documentController.activeDocument.currentView === "design"){ | 95 | if(this.application.ninja.documentController.activeDocument.currentView === "design"){ |
96 | this._selectedItems = this.application.ninja.selectedElements.slice(0); | 96 | this._selectedItems = this.application.ninja.selectedElements.slice(0); |
97 | if(this._selectedItems.length === 0 ){ | 97 | this._isDocument = this._selectedItems.length === 0; |
98 | this._isDocument = true; | ||
99 | }else{ | ||
100 | this._isDocument = false; | ||
101 | } | ||
102 | NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument} ); | 98 | NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument} ); |
103 | } | 99 | } |
104 | } | 100 | } |