diff options
author | Valerio Virgillito | 2012-05-10 22:41:47 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-05-10 22:41:47 -0700 |
commit | 063252524696261bc347e2c3fb1ca82db80183e0 (patch) | |
tree | 78d22ad99979c5305481fd20a5ba59f327f9f057 /js/panels/properties.reel/properties.js | |
parent | cba4e3615f9d922a4bee9a72b48db06694b9bb81 (diff) | |
parent | f6f722feecf88c8afe59327eaf8557ce4012abc7 (diff) | |
download | ninja-063252524696261bc347e2c3fb1ca82db80183e0.tar.gz |
Merge pull request #217 from mencio/dom-architecture
Dom architecture - Fixed the selection and timeline bugs.
Diffstat (limited to 'js/panels/properties.reel/properties.js')
-rwxr-xr-x | js/panels/properties.reel/properties.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js index 8c2daa14..6f43ce03 100755 --- a/js/panels/properties.reel/properties.js +++ b/js/panels/properties.reel/properties.js | |||
@@ -78,6 +78,7 @@ exports.Properties = Montage.create(Component, { | |||
78 | if(this.application.ninja.selectedElements.length === 0 && this.application.ninja.currentDocument.documentRoot.nodeName.toLowerCase() !== "body") { | 78 | if(this.application.ninja.selectedElements.length === 0 && this.application.ninja.currentDocument.documentRoot.nodeName.toLowerCase() !== "body") { |
79 | this.displayStageProperties(); | 79 | this.displayStageProperties(); |
80 | } | 80 | } |
81 | this.displayElementProperties(this.application.ninja.currentDocument.documentRoot); | ||
81 | } | 82 | } |
82 | }, | 83 | }, |
83 | 84 | ||
@@ -174,8 +175,9 @@ exports.Properties = Montage.create(Component, { | |||
174 | handleSelectionChange: { | 175 | handleSelectionChange: { |
175 | value: function(event) { | 176 | value: function(event) { |
176 | if(event.detail.isDocument) { | 177 | if(event.detail.isDocument) { |
177 | if(this.application.ninja.currentDocument.documentRoot.nodeName.toLowerCase() === "body") return; | 178 | // if(this.application.ninja.currentDocument.documentRoot.nodeName.toLowerCase() === "body") return; |
178 | this.displayStageProperties(); | 179 | // this.displayStageProperties(); |
180 | this.displayElementProperties(this.application.ninja.currentDocument.documentRoot); | ||
179 | } else { | 181 | } else { |
180 | if(this.application.ninja.selectedElements.length === 1) { | 182 | if(this.application.ninja.selectedElements.length === 1) { |
181 | this.displayElementProperties(this.application.ninja.selectedElements[0]); | 183 | this.displayElementProperties(this.application.ninja.selectedElements[0]); |