diff options
Diffstat (limited to 'js/panels/properties.reel')
5 files changed, 97 insertions, 3 deletions
diff --git a/js/panels/properties.reel/properties.css b/js/panels/properties.reel/properties.css index f82d3660..0928da3a 100755 --- a/js/panels/properties.reel/properties.css +++ b/js/panels/properties.reel/properties.css | |||
@@ -47,6 +47,11 @@ padding-right:6px; | |||
47 | 47 | ||
48 | } | 48 | } |
49 | 49 | ||
50 | .propertiesPanel button.nj-skinned { | ||
51 | margin-left: -12px; | ||
52 | margin-top: -3px; | ||
53 | } | ||
54 | |||
50 | .propertiesPanel hr { | 55 | .propertiesPanel hr { |
51 | border: 0; | 56 | border: 0; |
52 | border-top: 1px solid #3c3c3c; | 57 | border-top: 1px solid #3c3c3c; |
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js index d5acd503..625e3eb6 100755 --- a/js/panels/properties.reel/properties.js +++ b/js/panels/properties.reel/properties.js | |||
@@ -146,8 +146,12 @@ exports.Properties = Montage.create(Component, { | |||
146 | value: function(event) { | 146 | value: function(event) { |
147 | // console.log("Element Change PI ", event.detail.source); // If the event comes from the pi don't need to update | 147 | // console.log("Element Change PI ", event.detail.source); // If the event comes from the pi don't need to update |
148 | if(event.detail.source && event.detail.source !== "pi") { | 148 | if(event.detail.source && event.detail.source !== "pi") { |
149 | var el = this.application.ninja.currentDocument.documentRoot; | ||
150 | if(this.application.ninja.selectedElements.length) { | ||
151 | el = this.application.ninja.selectedElements[0]; | ||
152 | } | ||
153 | |||
149 | // TODO - This should only update the properties that were changed. | 154 | // TODO - This should only update the properties that were changed. |
150 | var el = this.application.ninja.selectedElements[0]; | ||
151 | this.positionSize.leftPosition = parseFloat(ElementsMediator.getProperty(el, "left")); | 155 | this.positionSize.leftPosition = parseFloat(ElementsMediator.getProperty(el, "left")); |
152 | this.positionSize.topPosition = parseFloat(ElementsMediator.getProperty(el, "top")); | 156 | this.positionSize.topPosition = parseFloat(ElementsMediator.getProperty(el, "top")); |
153 | this.positionSize.heightSize = parseFloat(ElementsMediator.getProperty(el, "height")); | 157 | this.positionSize.heightSize = parseFloat(ElementsMediator.getProperty(el, "height")); |
@@ -194,6 +198,19 @@ exports.Properties = Montage.create(Component, { | |||
194 | this.positionSize.heightSize = parseFloat(ElementsMediator.getProperty(stage, "height")); | 198 | this.positionSize.heightSize = parseFloat(ElementsMediator.getProperty(stage, "height")); |
195 | this.positionSize.widthSize = parseFloat(ElementsMediator.getProperty(stage, "width")); | 199 | this.positionSize.widthSize = parseFloat(ElementsMediator.getProperty(stage, "width")); |
196 | 200 | ||
201 | if(this.threeD.inGlobalMode) | ||
202 | { | ||
203 | this.threeD.xAngle = ElementsMediator.get3DProperty(stage, "xAngle"); | ||
204 | this.threeD.yAngle = ElementsMediator.get3DProperty(stage, "yAngle"); | ||
205 | this.threeD.zAngle = ElementsMediator.get3DProperty(stage, "zAngle"); | ||
206 | } | ||
207 | |||
208 | if(ElementsMediator.getProperty(stage, "-webkit-transform-style") === "preserve-3d") { | ||
209 | this.threeD.flatten = false; | ||
210 | } else { | ||
211 | this.threeD.flatten = true; | ||
212 | } | ||
213 | |||
197 | if(this.customPi !== stage.elementModel.pi) { | 214 | if(this.customPi !== stage.elementModel.pi) { |
198 | // We need to unregister color chips from the previous selection from the Color Model | 215 | // We need to unregister color chips from the previous selection from the Color Model |
199 | var len = this.customSections.length; | 216 | var len = this.customSections.length; |
@@ -258,6 +275,11 @@ exports.Properties = Montage.create(Component, { | |||
258 | this.positionSize.heightSize = parseFloat(ElementsMediator.getProperty(el, "height")); | 275 | this.positionSize.heightSize = parseFloat(ElementsMediator.getProperty(el, "height")); |
259 | this.positionSize.widthSize = parseFloat(ElementsMediator.getProperty(el, "width")); | 276 | this.positionSize.widthSize = parseFloat(ElementsMediator.getProperty(el, "width")); |
260 | 277 | ||
278 | if(ElementsMediator.getProperty(el, "-webkit-transform-style") === "preserve-3d") { | ||
279 | this.threeD.flatten = false; | ||
280 | } else { | ||
281 | this.threeD.flatten = true; | ||
282 | } | ||
261 | 283 | ||
262 | if(this.threeD.inGlobalMode) | 284 | if(this.threeD.inGlobalMode) |
263 | { | 285 | { |
diff --git a/js/panels/properties.reel/sections/custom.reel/custom.js b/js/panels/properties.reel/sections/custom.reel/custom.js index ac316907..876fe110 100755 --- a/js/panels/properties.reel/sections/custom.reel/custom.js +++ b/js/panels/properties.reel/sections/custom.reel/custom.js | |||
@@ -15,6 +15,7 @@ var ColorSelect = require("js/panels/properties.reel/sections/custom-rows/color- | |||
15 | 15 | ||
16 | // Components Needed to make this work | 16 | // Components Needed to make this work |
17 | var Hottext = require("js/components/hottextunit.reel").HotTextUnit; | 17 | var Hottext = require("js/components/hottextunit.reel").HotTextUnit; |
18 | var HT = require("js/components/hottext.reel").HotText; | ||
18 | var Dropdown = require("js/components/combobox.reel").Combobox; | 19 | var Dropdown = require("js/components/combobox.reel").Combobox; |
19 | var TextField = require("js/components/textfield.reel").TextField; | 20 | var TextField = require("js/components/textfield.reel").TextField; |
20 | var FileInput = require("js/components/ui/file-input.reel").FileInput; | 21 | var FileInput = require("js/components/ui/file-input.reel").FileInput; |
@@ -168,6 +169,7 @@ exports.CustomSection = Montage.create(Component, { | |||
168 | value: function(fields) { | 169 | value: function(fields) { |
169 | switch(fields.type) { | 170 | switch(fields.type) { |
170 | case "hottext" : return this.createHottext(fields); | 171 | case "hottext" : return this.createHottext(fields); |
172 | case "ht" : return this.createHT(fields); | ||
171 | case "dropdown" : return this.createDropdown(fields); | 173 | case "dropdown" : return this.createDropdown(fields); |
172 | case "textbox" : return this.createTextField(fields); | 174 | case "textbox" : return this.createTextField(fields); |
173 | case "file" : return this.createFileInput(fields); | 175 | case "file" : return this.createFileInput(fields); |
@@ -178,6 +180,33 @@ exports.CustomSection = Montage.create(Component, { | |||
178 | } | 180 | } |
179 | }, | 181 | }, |
180 | 182 | ||
183 | createHT: { | ||
184 | value: function(aField) { | ||
185 | |||
186 | // Generate Hottext | ||
187 | var obj = HT.create(); | ||
188 | |||
189 | // Set Values for HottextRow | ||
190 | if (aField.id) obj.id = aField.id; | ||
191 | if (aField.value) obj.value = aField.value; | ||
192 | if (aField.min) obj._minValue = aField.min; | ||
193 | if (aField.max) obj._maxValue = aField.max; | ||
194 | if (aField.prop) obj.prop = aField.prop; | ||
195 | |||
196 | //Initiate onChange Events | ||
197 | obj.addEventListener("change", this, false); | ||
198 | obj.addEventListener("changing", this, false); | ||
199 | |||
200 | //Bind object value to controls list so it can be manipulated | ||
201 | Object.defineBinding(this.controls, aField.id, { | ||
202 | boundObject: obj, | ||
203 | boundObjectPropertyPath: "value" | ||
204 | }); | ||
205 | |||
206 | return obj; | ||
207 | } | ||
208 | }, | ||
209 | |||
181 | //Breaking Up Switch Case Statement to functions to return a row | 210 | //Breaking Up Switch Case Statement to functions to return a row |
182 | createHottext: { | 211 | createHottext: { |
183 | value: function(aField) { | 212 | value: function(aField) { |
diff --git a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html index 18a7369e..b6c25baf 100755 --- a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html +++ b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html | |||
@@ -22,7 +22,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
22 | "xAngleControl": {"@": "threeDRotX"}, | 22 | "xAngleControl": {"@": "threeDRotX"}, |
23 | "yAngleControl": {"@": "threeDRotY"}, | 23 | "yAngleControl": {"@": "threeDRotY"}, |
24 | "zAngleControl": {"@": "threeDRotZ"}, | 24 | "zAngleControl": {"@": "threeDRotZ"}, |
25 | "axisModeGroupControl": {"@": "axisModeGroup"} | 25 | "axisModeGroupControl": {"@": "axisModeGroup"}, |
26 | "flattenControl": {"@": "flattenCheckbox"} | ||
26 | } | 27 | } |
27 | }, | 28 | }, |
28 | 29 | ||
@@ -242,6 +243,29 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
242 | "value": "Global", | 243 | "value": "Global", |
243 | "group": {"@": "axisModeGroup"} | 244 | "group": {"@": "axisModeGroup"} |
244 | } | 245 | } |
246 | }, | ||
247 | "flattenCheckbox": { | ||
248 | "module": "montage/ui/checkbox.reel", | ||
249 | "name": "Checkbox", | ||
250 | "properties": { | ||
251 | "element": {"#": "flattenCh"}, | ||
252 | "identifier": "flatten", | ||
253 | "checked": false | ||
254 | }, | ||
255 | "bindings": { | ||
256 | "checked": { | ||
257 | "boundObject": {"@": "owner"}, | ||
258 | "boundObjectPropertyPath": "flatten", | ||
259 | "oneway": false | ||
260 | } | ||
261 | }, | ||
262 | "listeners": [ | ||
263 | { | ||
264 | "type": "action", | ||
265 | "listener": {"@": "owner"}, | ||
266 | "capture": false | ||
267 | } | ||
268 | ] | ||
245 | } | 269 | } |
246 | } | 270 | } |
247 | </script> | 271 | </script> |
@@ -335,7 +359,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
335 | <article class="fieldRow oneCol checkbox"> | 359 | <article class="fieldRow oneCol checkbox"> |
336 | <div> | 360 | <div> |
337 | <div class="inputField"> | 361 | <div class="inputField"> |
338 | <input class="nj-skinned" type="checkbox" /> | 362 | <input id="flattenCh" class="nj-skinned" type="checkbox" /> |
339 | </div> | 363 | </div> |
340 | <div> | 364 | <div> |
341 | <label> Flatten</label> | 365 | <label> Flatten</label> |
diff --git a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js index f72d1ff6..dcba51a4 100755 --- a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js +++ b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js | |||
@@ -79,6 +79,10 @@ exports.ThreeD = Montage.create(Component, { | |||
79 | value: 0 | 79 | value: 0 |
80 | }, | 80 | }, |
81 | 81 | ||
82 | flatten: { | ||
83 | value: false | ||
84 | }, | ||