aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorJonathan Duran2012-04-24 08:49:52 -0700
committerJonathan Duran2012-04-24 08:49:52 -0700
commit02414d5b25a53f7939d77c83ed550aad41e1f382 (patch)
treed918b1a78a44bddb55676d767069016db9fcda18 /js/panels
parent47488a6ff1b7fc32e2485b3dd82afe207b936b35 (diff)
parent55e6d621b9555abac06ab4adff44dfe29a78ec4e (diff)
downloadninja-02414d5b25a53f7939d77c83ed550aad41e1f382.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts: js/components/layout/bread-crumb.reel/bread-crumb.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels')
-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 }