Merge branch 'refs/heads/Ninja-Internal' into Color

Conflicts:
	js/controllers/elements/shapes-controller.js

3 files changed, 29 insertions, 1 deletions

diff --git a/js/panels/properties/sections/custom-rows/color-select.reel/color-select.html b/js/panels/properties/sections/custom-rows/color-select.reel/color-select.html
index 9c2588b9..96cc4de7 100755
--- a/js/panels/properties/sections/custom-rows/color-select.reel/color-select.html
+++ b/js/panels/properties/sections/custom-rows/color-select.reel/color-select.html
@@ -14,7 +14,9 @@
             "properties" : {
                 "element" : {"#": "section"},
                 "Stroke" : {"#": "Stroke"},
-                "Fill" : {"#": "Fill"}
+                "Fill" : {"#": "Fill"},
+                "strokeChip" : {"@": "colorChip"},
+                "fillChip" : {"@": "colorChip2"}
             }
         },
 
diff --git a/js/panels/properties/sections/custom-rows/color-select.reel/color-select.js b/js/panels/properties/sections/custom-rows/color-select.reel/color-select.js
index 60f8efef..3e81ff67 100755
--- a/js/panels/properties/sections/custom-rows/color-select.reel/color-select.js
+++ b/js/panels/properties/sections/custom-rows/color-select.reel/color-select.js
@@ -17,6 +17,14 @@ exports.ColorSelect = Montage.create(Component, {
         value: null
     },
 
+    strokeChip: {
+        value: null
+    },
+
+    fillChip: {
+        value: null
+    },
+
     handleChange: {
         value: function(e) {
 
@@ -57,6 +65,19 @@ exports.ColorSelect = Montage.create(Component, {
 //            }
 
         }
+    },
+
+    destroy: {
+        value: function() {
+            if(this.strokeChip)
+            {
+                this.strokeChip.destroy();
+            }
+            if(this.fillChip)
+            {
+                this.fillChip.destroy();
+            }
+        }
     }
 
 });
\ No newline at end of file
diff --git a/js/panels/properties/sections/custom.reel/custom.js b/js/panels/properties/sections/custom.reel/custom.js
index a2b9b9fa..a537d323 100755
--- a/js/panels/properties/sections/custom.reel/custom.js
+++ b/js/panels/properties/sections/custom.reel/custom.js
@@ -59,6 +59,8 @@ exports.CustomSection = Montage.create(Component, {
                         if(obj1.visible === false) tmpRow.colorVisible = obj1.visible;
                         if(obj2.visible === false) tmpRow.color2Visible = obj2.visible;
 
+                        // TODO - Hack for now to reference the color select object to unregister color chips
+                        this.controls["colorSelect"] = tmpRow;
                     }
                     else
                     {
@@ -344,6 +346,9 @@ 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;
+
             return obj;
         }
     }