aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/properties.js
diff options
context:
space:
mode:
authorArmen Kesablyan2012-07-02 13:20:43 -0700
committerArmen Kesablyan2012-07-02 13:20:43 -0700
commit5a6b1fcf207817a7aa0ba7d0c1bea90f0ee5e8cb (patch)
treeaf71b72b828d942ebf11f565b7c9ccff0798343d /js/panels/properties.reel/properties.js
parent8966fc4903f0eec61816d9b9bdbcac9b7d99c320 (diff)
parent526b9d76686323f488f1b26175440172b715d808 (diff)
downloadninja-5a6b1fcf207817a7aa0ba7d0c1bea90f0ee5e8cb.tar.gz
Merge branch 'refs/heads/master' into GIO-TextTool
Diffstat (limited to 'js/panels/properties.reel/properties.js')
-rwxr-xr-xjs/panels/properties.reel/properties.js19
1 files changed, 15 insertions, 4 deletions
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index 5719a63d..b2941fe8 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -296,9 +296,20 @@ exports.Properties = Montage.create(Component, {
296 296
297 // Root element color chip 297 // Root element color chip
298 if(isRoot) { 298 if(isRoot) {
299 var backgroundChip = this.customSections[0].content.controls["background"]; 299 //
300 var rootBackgroundColor = ElementsMediator.getProperty(el, "background"); 300 var rootBackgroundColor, backgroundChip = this.customSections[0].content.controls["background"];
301 301 //
302 if (ElementsMediator.getProperty(el, "background-image")) {
303 rootBackgroundColor = ElementsMediator.getProperty(el, "background-image");
304 if (!rootBackgroundColor.mode) rootBackgroundColor = null;
305 } else if (ElementsMediator.getProperty(el, "background-color")){
306 rootBackgroundColor = ElementsMediator.getProperty(el, "background-color");
307 if (!rootBackgroundColor.mode) rootBackgroundColor = null;
308 } else if (ElementsMediator.getProperty(el, "background")){
309 rootBackgroundColor = ElementsMediator.getProperty(el, "background");
310 if (!rootBackgroundColor.mode) rootBackgroundColor = null;
311 }
312 //
302 if(rootBackgroundColor) { 313 if(rootBackgroundColor) {
303 backgroundChip.color = rootBackgroundColor; 314 backgroundChip.color = rootBackgroundColor;
304 } else { 315 } else {
@@ -373,7 +384,7 @@ exports.Properties = Montage.create(Component, {
373 } 384 }
374 } 385 }
375 } 386 }
376 387 if (previousInput === 'chip') return;
377 this.application.ninja.colorController.colorModel.input = previousInput; 388 this.application.ninja.colorController.colorModel.input = previousInput;
378 var color = this.application.ninja.colorController.colorModel.colorHistory[previousInput][this.application.ninja.colorController.colorModel.colorHistory[previousInput].length-1]; 389 var color = this.application.ninja.colorController.colorModel.colorHistory[previousInput][this.application.ninja.colorController.colorModel.colorHistory[previousInput].length-1];
379 color.c.wasSetByCode = true; 390 color.c.wasSetByCode = true;