diff options
| author | Valerio Virgillito | 2012-05-11 15:00:36 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-05-11 15:00:36 -0700 |
| commit | f4c4bc7971a50f9e258d1ac23c70f8ea8cfe5dd6 (patch) | |
| tree | 297cc2bdd26c5a72bd88edf6d91be8ceef25e98b /js/panels | |
| parent | 2b718df00eb9f3a3d2ad269fab533967668988bf (diff) | |
| parent | 1fb663b5f348fe2ff5ce86a80e8a61be289eba70 (diff) | |
| download | ninja-f4c4bc7971a50f9e258d1ac23c70f8ea8cfe5dd6.tar.gz | |
Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into dom-architecture
Diffstat (limited to 'js/panels')
| -rwxr-xr-x | js/panels/properties.reel/properties.js | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js index 6f43ce03..20f670d9 100755 --- a/js/panels/properties.reel/properties.js +++ b/js/panels/properties.reel/properties.js | |||
| @@ -75,9 +75,7 @@ exports.Properties = Montage.create(Component, { | |||
| 75 | 75 | ||
| 76 | // For now always assume that the stage is selected by default when opening the old template | 76 | // For now always assume that the stage is selected by default when opening the old template |
| 77 | // TODO: Remove marker for old template: NINJA-STAGE-REWORK | 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 | |
| 79 | this.displayStageProperties(); | ||
| 80 | } | ||
| 81 | this.displayElementProperties(this.application.ninja.currentDocument.documentRoot); | 79 | this.displayElementProperties(this.application.ninja.currentDocument.documentRoot); |
| 82 | } | 80 | } |
| 83 | }, | 81 | }, |