diff options
author | Nivesh Rajbhandari | 2012-04-24 11:43:51 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-04-24 11:43:51 -0700 |
commit | 915d92707dd07bf5ddcaca7039114649dab61467 (patch) | |
tree | 9de810bfa45ebdb21005358e5b58414792b40bdf /js/panels | |
parent | a0daa3668883c8c35ce277b60509a3a3dcf303b2 (diff) | |
parent | 55e6d621b9555abac06ab4adff44dfe29a78ec4e (diff) | |
download | ninja-915d92707dd07bf5ddcaca7039114649dab61467.tar.gz |
Merge branch 'refs/heads/ninja-internal' into AllFixes
Diffstat (limited to 'js/panels')
-rwxr-xr-x | js/panels/properties.reel/properties.js | 5 |
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 | } |