Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document

1 files changed, 21 insertions, 4 deletions

diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index 4d048472..eb362796 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -46,7 +46,7 @@ exports.Properties = Montage.create(Component, {
 
     prepareForDraw: {
         value : function() {
-
+            this.eventManager.addEventListener("openDocument", this, false);
             this.eventManager.addEventListener("selectionChange", this, false);
 
             // This will be a toggle option
@@ -54,8 +54,6 @@ exports.Properties = Montage.create(Component, {
                 this.eventManager.addEventListener( "elementChanging", this, false);
             }
 
-            this.eventManager.addEventListener("openDocument", this, false);
-
             this.elementId.element.addEventListener("blur", this, false);
             this.elementId.element.addEventListener("focus", this, false);
             this.elementId.element.addEventListener("keyup", this, false);
@@ -70,6 +68,9 @@ exports.Properties = Montage.create(Component, {
         value: function() {
             this.eventManager.addEventListener( "elementChange", this, false);
 
+            // Save a reference of the pi inside the document view to be able to clear
+            this.application.ninja.currentDocument.model.views.design.propertiesPanel = this;
+
             // Display the default document root PI
             this.displayElementProperties(this.application.ninja.currentDocument.documentRoot);
         }
@@ -165,6 +166,15 @@ exports.Properties = Montage.create(Component, {
         }
     },
 
+    clear: {
+        value: function() {
+            this.elementName.value = "";
+            this.elementId.value = "";
+            this.elementClass.value = "";
+            this.customPi = null;
+        }
+    },
+
     displayElementProperties: {
         value: function (el) {
             var customPI, currentValue, isRoot = this.application.ninja.selectionController.isDocument;
@@ -210,9 +220,16 @@ exports.Properties = Montage.create(Component, {
                 this.displayCustomProperties(el, el.elementModel.pi);
             }
 
+            // Root element color chip
             if(isRoot) {
                 var backgroundChip = this.customSections[0].content.controls["background"];
-                if(backgroundChip) backgroundChip.color = ElementsMediator.getProperty(el, "background");
+                var rootBackgroundColor = ElementsMediator.getProperty(el, "background");
+
+                if(rootBackgroundColor) {
+                    backgroundChip.color = rootBackgroundColor;
+                } else {
+                    backgroundChip.color = null;
+                }
             }
 
                         var previousInput = this.application.ninja.colorController.colorModel.input;