From b435e97ff312eea15086069ce0ab6991acac32ff Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Mon, 25 Jun 2012 11:52:28 -0700
Subject: Color Popup Test Candidate

Preliminary check in for testing to commence on new color popup functionality.
---
 js/panels/properties.reel/properties.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/panels/properties.reel/properties.js')

diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index 5719a63d..c8383307 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -373,7 +373,7 @@ exports.Properties = Montage.create(Component, {
                         }
                     }
                 }
-
+                if (previousInput === 'chip') return;
                 this.application.ninja.colorController.colorModel.input =  previousInput;
                 var color = this.application.ninja.colorController.colorModel.colorHistory[previousInput][this.application.ninja.colorController.colorModel.colorHistory[previousInput].length-1];
     			color.c.wasSetByCode = true;
-- 
cgit v1.2.3


From c1a3bfcc53e4526d5bb54687ba18ccaaefa96fc2 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Thu, 28 Jun 2012 11:49:45 -0700
Subject: Fixing body PI background getter

---
 js/panels/properties.reel/properties.js | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'js/panels/properties.reel/properties.js')

diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index c8383307..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, {
 
                 // Root element color chip
                 if(isRoot) {
-                    var backgroundChip = this.customSections[0].content.controls["background"];
-                    var rootBackgroundColor = ElementsMediator.getProperty(el, "background");
-
+                	//
+                    var rootBackgroundColor, backgroundChip = this.customSections[0].content.controls["background"];
+                    //
+                    if (ElementsMediator.getProperty(el, "background-image")) {
+	                    rootBackgroundColor = ElementsMediator.getProperty(el, "background-image");
+	                    if (!rootBackgroundColor.mode) rootBackgroundColor = null;
+                    } else if (ElementsMediator.getProperty(el, "background-color")){
+	                    rootBackgroundColor = ElementsMediator.getProperty(el, "background-color");
+	                    if (!rootBackgroundColor.mode) rootBackgroundColor = null;
+                    } else if (ElementsMediator.getProperty(el, "background")){
+	                    rootBackgroundColor = ElementsMediator.getProperty(el, "background");
+	                    if (!rootBackgroundColor.mode) rootBackgroundColor = null;
+                    }
+                    //
                     if(rootBackgroundColor) {
                         backgroundChip.color = rootBackgroundColor;
                     } else {
-- 
cgit v1.2.3