diff options
| author | Eric Guzman | 2012-04-23 22:39:22 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-04-23 22:39:22 -0700 |
| commit | 1538514aad2d249a11152789cd06f5e00386d7d7 (patch) | |
| tree | c61fcc980d29d762a1ff2a3c5717b62991ed0a43 /js/panels | |
| parent | 64b9c65ddee456a717bae0872a54e0593f1cd482 (diff) | |
| parent | 55e6d621b9555abac06ab4adff44dfe29a78ec4e (diff) | |
| download | ninja-1538514aad2d249a11152789cd06f5e00386d7d7.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
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 | } |