aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-29 12:09:43 -0800
committerValerio Virgillito2012-02-29 12:09:43 -0800
commit3d233f25cff057fff5c5a75e4c4b40e88c22a8f5 (patch)
tree1ee8d228700cd37632f2213b260142b13aa69c70 /js/components/ui
parent3dbe798285f95dc63ae33739df5daadb8c432f24 (diff)
parent209e0781e926212bbaaad9e8ca4b61a0c389b30f (diff)
downloadninja-3d233f25cff057fff5c5a75e4c4b40e88c22a8f5.tar.gz
Merge branch 'NiveshColor' of https://github.com/mqg734/ninja-internal into integration-candidate
Diffstat (limited to 'js/components/ui')
-rwxr-xr-xjs/components/ui/color-chip.reel/color-chip.js15
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, {
92 this.changeDelegate(evt); 92 this.changeDelegate(evt);
93 } 93 }
94 } 94 }
95 },
96
97 destroy: {
98 value: function() {
99 this.application.ninja.colorController.removeButton(this.mode, this.chipBtn);
100 var mode = this.mode;
101 if(this.iconType) {
102 if(this.iconType === "fillIcon") {
103 mode = "fill";
104 } else if(this.iconType === "strokeIcon") {
105 mode = "stroke";
106 }
107 }
108 this.application.ninja.colorController.removeButton(mode, this.icon);
109 }
95 } 110 }
96 111
97}); 112});