aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnanya Sen2012-02-29 10:12:38 -0800
committerAnanya Sen2012-02-29 10:12:38 -0800
commit7a9c2a91dfbbdd0cd7c79d81be5aeecd7887e7f1 (patch)
tree27c7f39c01551d534fa8fa470fe2785bbf3d381b
parent1c7e86b6c2c802d720cc3075f75c7a61866ebc07 (diff)
downloadninja-7a9c2a91dfbbdd0cd7c79d81be5aeecd7887e7f1.tar.gz
handle selections for switching documents
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
-rwxr-xr-xjs/controllers/selection-controller.js6
-rwxr-xr-xjs/panels/properties/content.reel/content.js6
2 files changed, 11 insertions, 1 deletions
diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js
index 62313960..0f2a16e0 100755
--- a/js/controllers/selection-controller.js
+++ b/js/controllers/selection-controller.js
@@ -92,7 +92,11 @@ exports.SelectionController = Montage.create(Component, {
92 handleSwitchDocument: { 92 handleSwitchDocument: {
93 value: function() { 93 value: function() {
94 this._selectedItems = this.application.ninja.selectedElements.slice(0); 94 this._selectedItems = this.application.ninja.selectedElements.slice(0);
95 this._isDocument = false; 95 if(this._selectedItems.length === 0){
96 this._isDocument = true;
97 }else{
98 this._isDocument = false;
99 }
96 NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument} ); 100 NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument} );
97 } 101 }
98 }, 102 },
diff --git a/js/panels/properties/content.reel/content.js b/js/panels/properties/content.reel/content.js
index e92fbcb2..fcd85675 100755
--- a/js/panels/properties/content.reel/content.js
+++ b/js/panels/properties/content.reel/content.js
@@ -81,6 +81,12 @@ exports.Content = Montage.create(Component, {
81 // For now always assume that the stage is selected by default 81 // For now always assume that the stage is selected by default
82 if(this.application.ninja.selectedElements.length === 0) { 82 if(this.application.ninja.selectedElements.length === 0) {
83 this.displayStageProperties(); 83 this.displayStageProperties();
84 }else{
85 if(this.application.ninja.selectedElements.length === 1) {
86 this.displayElementProperties(this.application.ninja.selectedElements[0]._element);
87 } else {
88 this.displayGroupProperties(this.application.ninja.selectedElements);
89 }
84 } 90 }
85 } 91 }
86 }, 92 },