aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels')
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.css46
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.html2
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.js2
-rwxr-xr-xjs/panels/properties.reel/properties.js24
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.html28
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.js14
6 files changed, 104 insertions, 12 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/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index 40e9b86a..ca720ae7 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"));
@@ -196,6 +200,19 @@ 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
210 if(ElementsMediator.getProperty(stage, "-webkit-transform-style") === "preserve-3d") {
211 this.threeD.flatten = false;
212 } else {
213 this.threeD.flatten = true;
214 }
215
199 if(this.customPi !== stage.elementModel.pi) { 216 if(this.customPi !== stage.elementModel.pi) {
200 // We need to unregister color chips from the previous selection from the Color Model 217 // We need to unregister color chips from the previous selection from the Color Model
201 var len = this.customSections.length; 218 var len = this.customSections.length;
@@ -260,6 +277,11 @@ exports.Properties = Montage.create(Component, {
260 this.positionSize.heightSize = parseFloat(ElementsMediator.getProperty(el, "height")); 277 this.positionSize.heightSize = parseFloat(ElementsMediator.getProperty(el, "height"));
261 this.positionSize.widthSize = parseFloat(ElementsMediator.getProperty(el, "width")); 278 this.positionSize.widthSize = parseFloat(ElementsMediator.getProperty(el, "width"));
262 279
280 if(ElementsMediator.getProperty(el, "-webkit-transform-style") === "preserve-3d") {
281 this.threeD.flatten = false;
282 } else {
283 this.threeD.flatten = true;
284 }
263 285
264 if(this.threeD.inGlobalMode) 286 if(this.threeD.inGlobalMode)
265 { 287 {
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="checkb