aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels')
-rwxr-xr-xjs/panels/properties.reel/properties.js17
1 files changed, 14 insertions, 3 deletions
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, {
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 {