diff options
| author | Pushkar Joshi | 2012-04-24 08:29:30 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-04-24 08:29:30 -0700 |
| commit | e7bbd9b08b4cd87530596b370366d994ca766650 (patch) | |
| tree | 8862827848c55b36cc2e2bc0bb0c07a5e50dc1ca /js/panels/properties.reel | |
| parent | f57727d36709bbda03b45788dc12faf31a591b40 (diff) | |
| parent | 55e6d621b9555abac06ab4adff44dfe29a78ec4e (diff) | |
| download | ninja-e7bbd9b08b4cd87530596b370366d994ca766650.tar.gz | |
Merge branch 'master' into pentool
Diffstat (limited to 'js/panels/properties.reel')
| -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 | } |