aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/selection-controller.js
diff options
context:
space:
mode:
authorAnanya Sen2012-03-06 17:15:46 -0800
committerAnanya Sen2012-03-06 17:15:46 -0800
commit5afc582a1ae537f1e30113394780f1c8eec58f89 (patch)
treeeb1583408136c207631175405e410148da529652 /js/controllers/selection-controller.js
parent96e4a494d559da6b4041c1c14c26b53221276e4b (diff)
parentcef07085443b7c31e878daaad083b7408c57e104 (diff)
downloadninja-5afc582a1ae537f1e30113394780f1c8eec58f89.tar.gz
Merge branch 'refs/heads/FileIO-jose' into FileIO-ananya
Conflicts: js/controllers/selection-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/controllers/selection-controller.js')
-rwxr-xr-xjs/controllers/selection-controller.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js
index 49bf42b6..eff9c91a 100755
--- a/js/controllers/selection-controller.js
+++ b/js/controllers/selection-controller.js
@@ -77,7 +77,7 @@ exports.SelectionController = Montage.create(Component, {
77 77
78 78
79 this.application.ninja.selectedElements = currentSelectionArray; 79 this.application.ninja.selectedElements = currentSelectionArray;
80 NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument} ); 80 NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument});
81 81
82 82
83 83
@@ -90,7 +90,7 @@ 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);
@@ -154,7 +154,7 @@ exports.SelectionController = Montage.create(Component, {
154 value: function(event) { 154 value: function(event) {
155 this.application.ninja.selectedElements = []; 155 this.application.ninja.selectedElements = [];
156 this._isDocument = true; 156 this._isDocument = true;
157 NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument} ); 157 NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument});
158 } 158 }
159 }, 159 },
160 160