aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel
diff options
context:
space:
mode:
authorhwc4872012-07-09 16:08:02 -0700
committerhwc4872012-07-09 16:08:02 -0700
commit5085d0f67df89a21715308956004164597a6ba79 (patch)
tree2c896163143a66331205a39b0a3b1b45d51bf12a /js/panels/properties.reel
parent51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
downloadninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts: js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/panels/properties.reel')
-rwxr-xr-xjs/panels/properties.reel/properties.css10
-rwxr-xr-xjs/panels/properties.reel/properties.html8
-rwxr-xr-xjs/panels/properties.reel/properties.js70
-rwxr-xr-xjs/panels/properties.reel/section.reel/section.html2
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html2
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html4
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html4
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.html2
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.js32
-rwxr-xr-xjs/panels/properties.reel/sections/position-size.reel/position-size.html2
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.html2
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.js2
12 files changed, 70 insertions, 70 deletions
diff --git a/js/panels/properties.reel/properties.css b/js/panels/properties.reel/properties.css
index 3c6b1a61..67884628 100755
--- a/js/panels/properties.reel/properties.css
+++ b/js/panels/properties.reel/properties.css
@@ -121,7 +121,7 @@ padding-right:6px;
121.propertiesPanel .fieldRow.twoCol label { 121.propertiesPanel .fieldRow.twoCol label {
122 width:74px; 122 width:74px;
123 display: inline-block; 123 display: inline-block;
124 124
125} 125}
126 126
127.propertiesPanel .fieldRow.oneCol label { 127.propertiesPanel .fieldRow.oneCol label {
@@ -276,10 +276,10 @@ padding-right:6px;
276} 276}
277 277
278.propertiesPanel .colortoolbar .chipContainer { 278.propertiesPanel .colortoolbar .chipContainer {
279 margin-top: 2px; 279 margin-top: 2px;
280 background: url(../../../../../images/colorpanel/transparent.png) repeat; 280 background: url(../../../../../images/colorpanel/transparent.png) repeat;
281 width: 40px; 281 width: 40px;
282 height: 20px; 282 height: 20px;
283} 283}
284 284
285.propertiesPanel .button:active { 285.propertiesPanel .button:active {
diff --git a/js/panels/properties.reel/properties.html b/js/panels/properties.reel/properties.html
index 5ec78c05..5e355ef1 100755
--- a/js/panels/properties.reel/properties.html
+++ b/js/panels/properties.reel/properties.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
@@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE.
30</copyright> --> 30</copyright> -->
31<html lang="en"> 31<html lang="en">
32<head> 32<head>
33 <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 33 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
34 <link rel="stylesheet" href="properties.css" type="text/css"> 34 <link rel="stylesheet" href="properties.css" type="text/css">
35 <script type="text/montage-serialization"> 35 <script type="text/montage-serialization">
36 { 36 {
@@ -127,8 +127,8 @@ POSSIBILITY OF SUCH DAMAGE.
127 "threeD": {"@": "threeDProperties"} 127 "threeD": {"@": "threeDProperties"}
128 } 128 }
129 } 129 }
130 } 130 }
131 </script> 131 </script>
132</head> 132</head>
133<body> 133<body>
134 <section data-montage-id="propertiesPanel" class="propertiesPanel"> 134 <section data-montage-id="propertiesPanel" class="propertiesPanel">
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index b83ae170..070f6f87 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -163,12 +163,12 @@ exports.Properties = Montage.create(Component, {
163 NJevent("updatedID",this.application.ninja.selectedElements[0]); 163 NJevent("updatedID",this.application.ninja.selectedElements[0]);
164 } 164 }
165 }, 165 },
166 166
167 handleKeyup: { 167 handleKeyup: {
168 value: function(event) { 168 value: function(event) {
169 if(event.keyCode === 13) { 169 if(event.keyCode === 13) {
170 event.target.blur(); 170 event.target.blur();
171 } 171 }
172 } 172 }
173 }, 173 },
174 174
@@ -320,18 +320,18 @@ exports.Properties = Montage.create(Component, {
320 320
321 // Root element color chip 321 // Root element color chip
322 if(isRoot) { 322 if(isRoot) {
323 // 323 //
324 var rootBackgroundColor, backgroundChip = this.customSections[0].content.controls["background"]; 324 var rootBackgroundColor, backgroundChip = this.customSections[0].content.controls["background"];
325 // 325 //
326 if (ElementsMediator.getProperty(el, "background-image")) { 326 if (ElementsMediator.getProperty(el, "background-image")) {
327 rootBackgroundColor = ElementsMediator.getProperty(el, "background-image"); 327 rootBackgroundColor = ElementsMediator.getProperty(el, "background-image");
328 if (!rootBackgroundColor.mode) rootBackgroundColor = null; 328 if (!rootBackgroundColor.mode) rootBackgroundColor = null;
329 } else if (ElementsMediator.getProperty(el, "background-color")){ 329 } else if (ElementsMediator.getProperty(el, "background-color")){
330 rootBackgroundColor = ElementsMediator.getProperty(el, "background-color"); 330 rootBackgroundColor = ElementsMediator.getProperty(el, "background-color");
331 if (!rootBackgroundColor.mode) rootBackgroundColor = null; 331 if (!rootBackgroundColor.mode) rootBackgroundColor = null;
332 } else if (ElementsMediator.getProperty(el, "background")){ 332 } else if (ElementsMediator.getProperty(el, "background")){
333 rootBackgroundColor = ElementsMediator.getProperty(el, "background"); 333 rootBackgroundColor = ElementsMediator.getProperty(el, "background");
334 if (!rootBackgroundColor.mode) rootBackgroundColor = null; 334 if (!rootBackgroundColor.mode) rootBackgroundColor = null;
335 } 335 }
336 // 336 //
337 if(rootBackgroundColor) { 337 if(rootBackgroundColor) {
@@ -344,7 +344,7 @@ exports.Properties = Montage.create(Component, {
344 344
345 345
346 346
347 var previousInput = this.application.ninja.colorController.colorModel.input; 347 var previousInput = this.application.ninja.colorController.colorModel.input;
348 customPI = PiData[this.customPi]; 348 customPI = PiData[this.customPi];
349 // Get all the custom section for the custom PI 349 // Get all the custom section for the custom PI
350 for(var i = 0, customSec; customSec = customPI[i]; i++) { 350 for(var i = 0, customSec; customSec = customPI[i]; i++) {
@@ -411,31 +411,31 @@ exports.Properties = Montage.create(Component, {
411 if (previousInput === 'chip') return; 411 if (previousInput === 'chip') return;
412 this.application.ninja.colorController.colorModel.input = previousInput; 412 this.application.ninja.colorController.colorModel.input = previousInput;
413 var color = this.application.ninja.colorController.colorModel.colorHistory[previousInput][this.application.ninja.colorController.colorModel.colorHistory[previousInput].length-1]; 413 var color = this.application.ninja.colorController.colorModel.colorHistory[previousInput][this.application.ninja.colorController.colorModel.colorHistory[previousInput].length-1];
414 color.c.wasSetByCode = true; 414 color.c.wasSetByCode = true;
415 color.c.type = 'change'; 415 color.c.type = 'change';
416 switch (color.m) { 416 switch (color.m) {
417 case 'rgb': 417 case 'rgb':
418 this.application.ninja.colorController.colorModel.alpha = {value: color.a, wasSetByCode: true, type: 'change'}; 418 this.application.ninja.colorController.colorModel.alpha = {value: color.a, wasSetByCode: true, type: 'change'};
419 this.application.ninja.colorController.colorModel.rgb = color.c; 419 this.application.ninja.colorController.colorModel.rgb = color.c;
420 break; 420 break;
421 case 'hsl': 421 case 'hsl':
422 this.application.ninja.colorController.colorModel.alpha = {value: color.a, wasSetByCode: true, type: 'change'}; 422 this.application.ninja.colorController.colorModel.alpha = {value: color.a, wasSetByCode: true, type: 'change'};
423 this.application.ninja.colorController.colorModel.hsl = color.c; 423 this.application.ninja.colorController.colorModel.hsl = color.c;
424 break; 424 break;
425 case 'hex': 425 case 'hex':
426 //TODO: Check if anything needed here 426 //TODO: Check if anything needed here
427 break; 427 break;
428 case 'gradient': 428 case 'gradient':
429 this.application.ninja.colorController.colorModel.gradient = color.c; 429 this.application.ninja.colorController.colorModel.gradient = color.c;
430 break; 430 break;
431 case 'hsv': 431 case 'hsv':
432 this.application.ninja.colorController.colorModel.alpha = {value: color.a, wasSetByCode: true, type: 'change'}; 432 this.application.ninja.colorController.colorModel.alpha = {value: color.a, wasSetByCode: true, type: 'change'};
433 this.application.ninja.colorController.colorModel.hsv = color.c; 433 this.application.ninja.colorController.colorModel.hsv = color.c;
434 break; 434 break;
435 default: 435 default:
436 this.application.ninja.colorController.colorModel.applyNoColor(true); 436 this.application.ninja.colorController.colorModel.applyNoColor(true);
437 break; 437 break;
438 } 438 }
439 } 439 }
440 } 440 }
441 }, 441 },
diff --git a/js/panels/properties.reel/section.reel/section.html b/js/panels/properties.reel/section.reel/section.html
index 5e6c05bb..17bac0f2 100755
--- a/js/panels/properties.reel/section.reel/section.html
+++ b/js/panels/properties.reel/section.reel/section.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
diff --git a/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html b/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html
index e993475e..ca446a01 100755
--- a/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html
+++ b/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>