diff options
author | Armen Kesablyan | 2012-05-23 14:34:58 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-05-23 14:34:58 -0700 |
commit | c21db7f1e4a0582777bdb5366df5d023a915b779 (patch) | |
tree | c4d29cb4686101d4a480ae836d20187879cf5400 /js/controllers/selection-controller.js | |
parent | 3ed95247e9ea4b0a7833401ed6809647b7c4acbf (diff) | |
parent | 1a7e347810401e6262d9d7bad1c3583e6773993b (diff) | |
download | ninja-c21db7f1e4a0582777bdb5366df5d023a915b779.tar.gz |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/data/panels-data.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/controllers/selection-controller.js')
-rwxr-xr-x | js/controllers/selection-controller.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js index 6e40abb5..1092615a 100755 --- a/js/controllers/selection-controller.js +++ b/js/controllers/selection-controller.js | |||
@@ -81,10 +81,10 @@ exports.SelectionController = Montage.create(Component, { | |||
81 | 81 | ||
82 | handleSwitchDocument: { | 82 | handleSwitchDocument: { |
83 | value: function() { | 83 | value: function() { |
84 | if(this.application.ninja.documentController.activeDocument.currentView === "design"){ | 84 | // if(this.application.ninja.documentController.activeDocument.currentView === "design"){ |
85 | this._isDocument = this.application.ninja.selectedElements.length === 0; | 85 | this._isDocument = this.application.ninja.selectedElements.length === 0; |
86 | NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument} ); | 86 | NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument} ); |
87 | } | 87 | // } |
88 | } | 88 | } |
89 | }, | 89 | }, |
90 | 90 | ||