diff options
author | Pushkar Joshi | 2012-03-14 15:39:59 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-03-14 15:39:59 -0700 |
commit | 571ed9ef856780eded3ac7104ed0ce72c7c7c81c (patch) | |
tree | fc7bdcd86b2eb742f4cda2ccdee6bd599b1f382e /js/controllers | |
parent | 23baa44e0bc7bfb24e42702c1ef58bf62da083d8 (diff) | |
parent | 089534a80c64226bf7d124ab9147afce386fdb5c (diff) | |
download | ninja-571ed9ef856780eded3ac7104ed0ce72c7c7c81c.tar.gz |
Merge branch 'master' into pentool
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 | } |