2 files changed, 9 insertions, 12 deletions

diff --git a/js/panels/properties/content.reel/content.js b/js/panels/properties/content.reel/content.js
index b15f2d71..1ec6d769 100644
--- a/js/panels/properties/content.reel/content.js
+++ b/js/panels/properties/content.reel/content.js
@@ -156,10 +156,6 @@ exports.Content = Montage.create(Component, {
             var backgroundChip = this.customSections[0].content.controls["background"];
             backgroundChip.initialColor = ElementsMediator.getProperty(stage, "background");
 
-            // Get stage color
-            //var backgroundColor =
-            //console.log(backgroundColor);
-
             /*
             var customPI = PiData[this.customPi];
             // Get all the custom section for the custom PI
@@ -180,10 +176,6 @@ exports.Content = Montage.create(Component, {
         }
     },
 
-    foo: {
-        value: null
-    },
-
     handleFirstDraw: {
         value: function() {
             this.foo.chipBtn.color('rgb', {wasSetByCode: true, type: 'change', color: {r: 255, g: 0, b: 0}, css: 'rgb(255,0,0)'});
diff --git a/js/panels/properties/sections/custom.reel/custom.js b/js/panels/properties/sections/custom.reel/custom.js
index 5315defc..a2b9b9fa 100644
--- a/js/panels/properties/sections/custom.reel/custom.js
+++ b/js/panels/properties/sections/custom.reel/custom.js
@@ -105,13 +105,14 @@ exports.CustomSection = Montage.create(Component, {
                 }
         },
 
+    /**
+     * Color change handler. Hard coding the stage for now since only the stage PI uses this color chip
+     */
     handleColorChange: {
         value: function(event) {
             // Change the stage color for now
-            console.log(this);
-            console.log(event);
-            console.log(event._event.color.css);
-            ElementsMediator.setProperty([this.application.ninja.currentDocument.documentRoot], "background", [event._event.color.css], "Change", "pi", 'foo');
+            //console.log(this, event);
+            ElementsMediator.setProperty([this.application.ninja.currentDocument.documentRoot], this.id, [event._event.color.css], "Change", "pi", '');
             /*
             var propEvent = document.createEvent("CustomEvent");
             propEvent.initEvent("propertyChange", true, true);
@@ -330,11 +331,15 @@ exports.CustomSection = Montage.create(Component, {
     createColorChip: {
         value: function(aField) {
             var obj = ColorChip.create();
+
             obj.chip = true;
             obj.iconType = "fillIcon";
             obj.mode = "chip";
             obj.offset = 0;
 
+            if (aField.id)          obj.id = aField.id;
+            if (aField.prop)        obj.prop = aField.prop;
+
             obj.changeDelegate = this.handleColorChange;
 
             this.controls[aField.id] = obj;