aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel
diff options
context:
space:
mode:
authorAnanya Sen2012-04-26 12:57:56 -0700
committerAnanya Sen2012-04-26 12:57:56 -0700
commitb2132103b12e499f26e6e0f311d48555a9f733ff (patch)
tree2eaa000b460e4be3c8050a369318584b2591e8d7 /js/panels/properties.reel
parent07c611323c109aaa2208ebc15a354b81c3f04a0d (diff)
parent902dc18296fc78f3b8e67d952c42981d926bb2fc (diff)
downloadninja-b2132103b12e499f26e6e0f311d48555a9f733ff.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements
Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/panels/properties.reel')
-rwxr-xr-xjs/panels/properties.reel/properties.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index d9dca538..b21014c1 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -73,8 +73,9 @@ exports.Properties = Montage.create(Component, {
73 73
74 this.eventManager.addEventListener( "elementChange", this, false); 74 this.eventManager.addEventListener( "elementChange", this, false);
75 75
76 // For now always assume that the stage is selected by default 76 // For now always assume that the stage is selected by default when opening the old template
77 if(this.application.ninja.selectedElements.length === 0) { 77 // TODO: Remove marker for old template: NINJA-STAGE-REWORK
78 if(this.application.ninja.selectedElements.length === 0 && this.application.ninja.currentDocument.documentRoot.nodeName.toLowerCase() !== "body") {
78 this.displayStageProperties(); 79 this.displayStageProperties();
79 } 80 }
80 } 81 }