aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
authorEric Guzman2012-03-14 10:58:02 -0700
committerEric Guzman2012-03-14 10:58:02 -0700
commit562e6d71d8bbe149f856b126e4c4246fc2d843ef (patch)
treef4f4f551003807d5344a93ebcad88f99d2c15444 /js/controllers
parent9aa0880cd37d34c9c2d9c4ed455aa1f562f56ef3 (diff)
parent6df430d86c289413fea48f8e2ac37def72fbde46 (diff)
downloadninja-562e6d71d8bbe149f856b126e4c4246fc2d843ef.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/controllers')
-rwxr-xr-xjs/controllers/selection-controller.js8
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 }