diff options
author | hwc487 | 2012-03-06 11:41:28 -0800 |
---|---|---|
committer | hwc487 | 2012-03-06 11:41:28 -0800 |
commit | 5e640e24c3b4658b8060cde837ae98dabd3ba5bf (patch) | |
tree | 527f183b5e485282ce1efe15d96b6b8ddc26801e /js/components/ui/color-chip.reel/color-chip.js | |
parent | 182f05f2f7a8f43f1589c9b8c15bf00d6e983676 (diff) | |
parent | 2815adfd7c19b3dff89dc3e1bda9af8d30dca8d6 (diff) | |
download | ninja-5e640e24c3b4658b8060cde837ae98dabd3ba5bf.tar.gz |
Merge branch 'TimelineUber' of github.com:imix23ways/ninja-internal into integration
Diffstat (limited to 'js/components/ui/color-chip.reel/color-chip.js')
-rwxr-xr-x | js/components/ui/color-chip.reel/color-chip.js | 15 |
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 | }); |