diff options
author | Jonathan Duran | 2012-04-10 08:13:00 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-04-10 08:13:00 -0700 |
commit | 58e049b68e03abbacde93206d2666361022c0858 (patch) | |
tree | f1ce6b8a378674d4abcac68acd0bcca93b838a39 /js/panels | |
parent | a9050f96d814469f420bcf3630d16d576b62258e (diff) | |
parent | bd43ce383b050d03b0f92cc923c517febc66ca28 (diff) | |
download | ninja-58e049b68e03abbacde93206d2666361022c0858.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/panels')
8 files changed, 110 insertions, 13 deletions
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.css b/js/panels/Materials/materials-popup.reel/materials-popup.css index 89233c64..2d339411 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.css +++ b/js/panels/Materials/materials-popup.reel/materials-popup.css | |||
@@ -37,21 +37,53 @@ | |||
37 | .mp_property | 37 | .mp_property |
38 | { | 38 | { |
39 | height:40px; | 39 | height:40px; |
40 | position: relative; | ||
40 | } | 41 | } |
41 | 42 | ||
42 | .mp_property > .prop-label | 43 | .mp_property > .prop-label |
43 | { | 44 | { |
44 | float: left; | 45 | position:relative; |
45 | /*width:86px;*/ | 46 | top:12px; |
46 | margin: 0px 8px 2px 5px; | 47 | float: left; |
48 | width: 100px; | ||
47 | } | 49 | } |
48 | 50 | ||
49 | .mp_property > .prop-controller | 51 | .mp_property > .prop-controller |
50 | { | 52 | { |
51 | float: right; | 53 | position:relative; |
52 | clear: left; | 54 | top:12px; |
53 | width: auto; | 55 | left: 10px; |
54 | margin: 0px 0px 3px 0px; | 56 | float: left; |
57 | } | ||
58 | |||
59 | .mp_property .hottext, | ||
60 | .mp_property .hottextInput | ||
61 | { | ||
62 | width: 30px; | ||
63 | } | ||
64 | |||
65 | .mp_property .button | ||
66 | { | ||
67 | width: 30px; | ||
68 | height: 20px; | ||
69 | } | ||
70 | |||
71 | .mp_property .inputRow | ||
72 | { | ||
73 | top: 8px; | ||
74 | position: relative; | ||
75 | } | ||
76 | |||
77 | .mp_properties_list | ||
78 | { | ||
79 | padding-bottom: 8px; | ||
80 | } | ||
81 | |||
82 | .mp_properties_list > .mp_property > .colortoolbar | ||
83 | { | ||
84 | width: 27px !important; | ||
85 | height: 27px !important; | ||
86 | overflow:hidden !important; | ||
55 | } | 87 | } |
56 | 88 | ||
57 | .mp_buttons { | 89 | .mp_buttons { |
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.html b/js/panels/Materials/materials-popup.reel/materials-popup.html index 34f68554..ae0ee2c8 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.html +++ b/js/panels/Materials/materials-popup.reel/materials-popup.html | |||
@@ -104,7 +104,7 @@ | |||
104 | 104 | ||
105 | <hr /> | 105 | <hr /> |
106 | 106 | ||
107 | <div id="mp_properties_list" class="mp_properties_list" style="-webkit-user-select: none;"> | 107 | <div id="mp_properties_list" class="mp_properties_list"> |
108 | <div id="mp_property" class="mp_property"></div> | 108 | <div id="mp_property" class="mp_property"></div> |
109 | </div> | 109 | </div> |
110 | 110 | ||
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js index b44761bc..bbccf45d 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.js +++ b/js/panels/Materials/materials-popup.reel/materials-popup.js | |||
@@ -237,7 +237,7 @@ exports.MaterialsPopup = Montage.create(Component, { | |||
237 | } | 237 | } |
238 | else | 238 | else |
239 | { | 239 | { |
240 | this.materialsData = this._dummyData1; | 240 | this.materialsData = this._dummyData1.slice(0); |
241 | } | 241 | } |
242 | 242 | ||
243 | this.needsDraw = true; | 243 | this.needsDraw = true; |
diff --git a/js/panels/Splitter.js b/js/panels/Splitter.js index ac45b4ba..98ebb36a 100755 --- a/js/panels/Splitter.js +++ b/js/panels/Splitter.js | |||
@@ -55,7 +55,7 @@ exports.Splitter = Montage.create(Component, { | |||
55 | }, | 55 | }, |
56 | set: function(value) { | 56 | set: function(value) { |
57 | this._collapsed = value; | 57 | this._collapsed = value; |
58 | this.needsDraw = true; | 58 | |
59 | this.application.localStorage.setItem(this.element.getAttribute("data-montage-id"), {"version": this.version, "value": value}); | 59 | this.application.localStorage.setItem(this.element.getAttribute("data-montage-id"), {"version": this.version, "value": value}); |
60 | } | 60 | } |
61 | }, | 61 | }, |
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/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": { | ||