diff options
author | Nivesh Rajbhandari | 2012-03-22 11:16:39 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-03-22 11:16:39 -0700 |
commit | bead8ce9e292f030a4b2fba6ad7fd38fb4fe5199 (patch) | |
tree | bb49957ed4d2bd96e97618b95d79fcd73d1fc147 /js/panels | |
parent | 92854b266936f844370688da3b15d035a041e8c2 (diff) | |
download | ninja-bead8ce9e292f030a4b2fba6ad7fd38fb4fe5199.tar.gz |
IKNINJA-758 - The rotation value of the stage is not updated in the properties panel.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/panels')
-rwxr-xr-x | js/panels/properties.reel/properties.js | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js index 40e9b86a..782dd138 100755 --- a/js/panels/properties.reel/properties.js +++ b/js/panels/properties.reel/properties.js | |||
@@ -147,8 +147,12 @@ exports.Properties = Montage.create(Component, { | |||
147 | value: function(event) { | 147 | value: function(event) { |
148 | // console.log("Element Change PI ", event.detail.source); // If the event comes from the pi don't need to update | 148 | // console.log("Element Change PI ", event.detail.source); // If the event comes from the pi don't need to update |
149 | if(event.detail.source && event.detail.source !== "pi") { | 149 | if(event.detail.source && event.detail.source !== "pi") { |
150 | var el = this.application.ninja.currentDocument.documentRoot; | ||
151 | if(this.application.ninja.selectedElements.length) { | ||
152 | el = this.application.ninja.selectedElements[0]._element || this.application.ninja.selectedElements[0]; | ||
153 | } | ||
154 | |||
150 | // TODO - This should only update the properties that were changed. | 155 | // TODO - This should only update the properties that were changed. |
151 | var el = this.application.ninja.selectedElements[0]._element || this.application.ninja.selectedElements[0]; | ||
152 | this.positionSize.leftPosition = parseFloat(ElementsMediator.getProperty(el, "left")); | 156 | this.positionSize.leftPosition = parseFloat(ElementsMediator.getProperty(el, "left")); |
153 | this.positionSize.topPosition = parseFloat(ElementsMediator.getProperty(el, "top")); | 157 | this.positionSize.topPosition = parseFloat(ElementsMediator.getProperty(el, "top")); |
154 | this.positionSize.heightSize = parseFloat(ElementsMediator.getProperty(el, "height")); | 158 | this.positionSize.heightSize = parseFloat(ElementsMediator.getProperty(el, "height")); |
@@ -162,9 +166,9 @@ exports.Properties = Montage.create(Component, { | |||
162 | this.threeD.xAngle = ElementsMediator.get3DProperty(el, "xAngle"); | 166 | this.threeD.xAngle = ElementsMediator.get3DProperty(el, "xAngle"); |
163 | this.threeD.yAngle = ElementsMediator.get3DProperty(el, "yAngle"); | 167 | this.threeD.yAngle = ElementsMediator.get3DProperty(el, "yAngle"); |
164 | this.threeD.zAngle = ElementsMediator.get3DProperty(el, "zAngle"); | 168 | this.threeD.zAngle = ElementsMediator.get3DProperty(el, "zAngle"); |
169 | } | ||
165 | } | 170 | } |
166 | } | 171 | } |
167 | } | ||
168 | }, | 172 | }, |
169 | 173 | ||
170 | handleSelectionChange: { | 174 | handleSelectionChange: { |
@@ -196,6 +200,13 @@ exports.Properties = Montage.create(Component, { | |||
196 | this.positionSize.heightSize = parseFloat(ElementsMediator.getProperty(stage, "height")); | 200 | this.positionSize.heightSize = parseFloat(ElementsMediator.getProperty(stage, "height")); |
197 | this.positionSize.widthSize = parseFloat(ElementsMediator.getProperty(stage, "width")); | 201 | this.positionSize.widthSize = parseFloat(ElementsMediator.getProperty(stage, "width")); |
198 | 202 | ||
203 | if(this.threeD.inGlobalMode) | ||
204 | { | ||
205 | this.threeD.xAngle = ElementsMediator.get3DProperty(stage, "xAngle"); | ||
206 | this.threeD.yAngle = ElementsMediator.get3DProperty(stage, "yAngle"); | ||
207 | this.threeD.zAngle = ElementsMediator.get3DProperty(stage, "zAngle"); | ||
208 | } | ||
209 | |||
199 | if(this.customPi !== stage.elementModel.pi) { | 210 | if(this.customPi !== stage.elementModel.pi) { |
200 | // We need to unregister color chips from the previous selection from the Color Model | 211 | // We need to unregister color chips from the previous selection from the Color Model |
201 | var len = this.customSections.length; | 212 | var len = this.customSections.length; |