Merge branch 'refs/heads/ninja-internal-master' into FileIO

Conflicts:
	js/controllers/selection-controller.js
	js/document/html-document.js
	js/panels/properties/content.reel/content.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 15 insertions, 0 deletions

diff --git a/js/components/ui/color-chip.reel/color-chip.js b/js/components/ui/color-chip.reel/color-chip.js
index ed1ac27a..7a7411da 100755
--- a/js/components/ui/color-chip.reel/color-chip.js
+++ b/js/components/ui/color-chip.reel/color-chip.js
@@ -92,6 +92,21 @@ var ColorChip = exports.ColorChip = Montage.create(Component, {
                 this.changeDelegate(evt);
             }
         }
+    },
+
+    destroy: {
+        value: function() {
+            this.application.ninja.colorController.removeButton(this.mode, this.chipBtn);
+            var mode = this.mode;
+            if(this.iconType) {
+                if(this.iconType === "fillIcon") {
+                    mode = "fill";
+                } else if(this.iconType === "strokeIcon") {
+                    mode = "stroke";
+                }
+            }
+            this.application.ninja.colorController.removeButton(mode, this.icon);
+        }
     }
 
 });