From a341522e3603c18ab3b93defa894e3be702dd0f4 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Tue, 22 May 2012 17:45:35 -0700
Subject: fixing the undefined 'color' issue

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/panels/properties.reel/properties.js            | 32 ++++++++++++++--------
 .../properties.reel/sections/custom.reel/custom.js |  2 +-
 2 files changed, 22 insertions(+), 12 deletions(-)

(limited to 'js')

diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index eb362796..b292a66a 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -48,6 +48,7 @@ exports.Properties = Montage.create(Component, {
         value : function() {
             this.eventManager.addEventListener("openDocument", this, false);
             this.eventManager.addEventListener("selectionChange", this, false);
+            this.eventManager.addEventListener("closeDocument", this, false);
 
             // This will be a toggle option
             if(this.application.ninja.appData.PILiveUpdate) {
@@ -76,6 +77,12 @@ exports.Properties = Montage.create(Component, {
         }
     },
 
+    handleCloseDocument: {
+        value: function(){
+            this.clear();
+        }
+    },
+
     /**
      * Blur and Key up to handle change in the Element ID field.
      */
@@ -172,6 +179,7 @@ exports.Properties = Montage.create(Component, {
             this.elementId.value = "";
             this.elementClass.value = "";
             this.customPi = null;
+            this.customSections = [];
         }
     },
 
@@ -211,27 +219,29 @@ exports.Properties = Montage.create(Component, {
                     controls = this.customSections[n].content.controls;
                     if(controls["colorSelect"]) {
                         controls["colorSelect"].destroy();
-                    } else if(controls["stageBackground"]) {
-                        controls["stageBackground"].destroy();
+                    } else if(controls["background"]) {
+                        controls["background"].destroy();
                     }
                 }
 
                 this.customPi = el.elementModel.pi;
                 this.displayCustomProperties(el, el.elementModel.pi);
-            }
 
-            // Root element color chip
-            if(isRoot) {
-                var backgroundChip = this.customSections[0].content.controls["background"];
-                var rootBackgroundColor = ElementsMediator.getProperty(el, "background");
+                // Root element color chip
+                if(isRoot) {
+                    var backgroundChip = this.customSections[0].content.controls["background"];
+                    var rootBackgroundColor = ElementsMediator.getProperty(el, "background");
 
-                if(rootBackgroundColor) {
-                    backgroundChip.color = rootBackgroundColor;
-                } else {
-                    backgroundChip.color = null;
+                    if(rootBackgroundColor) {
+                        backgroundChip.color = rootBackgroundColor;
+                    } else {
+                        backgroundChip.color = null;
+                    }
                 }
             }
 
+
+
 			var previousInput = this.application.ninja.colorController.colorModel.input;
             customPI = PiData[this.customPi];
             // Get all the custom section for the custom PI
diff --git a/js/panels/properties.reel/sections/custom.reel/custom.js b/js/panels/properties.reel/sections/custom.reel/custom.js
index 49b4414e..b1fd910d 100755
--- a/js/panels/properties.reel/sections/custom.reel/custom.js
+++ b/js/panels/properties.reel/sections/custom.reel/custom.js
@@ -400,7 +400,7 @@ exports.CustomSection = Montage.create(Component, {
             this.controls[aField.id] = obj;
 
             // TODO - Hack for now to reference the color select object to unregister color chips
-            this.controls["stageBackground"] = obj;
+            this.controls["background"] = obj;
 
             return obj;
         }
-- 
cgit v1.2.3