diff options
author | Jon Reid | 2012-03-01 09:23:46 -0800 |
---|---|---|
committer | Jon Reid | 2012-03-01 09:23:46 -0800 |
commit | e67000c704e284f4ab9b50c845853988272ce800 (patch) | |
tree | fad04a6a5ef5bfc8fa4efe88dac3eb7329bc3596 /js/panels/properties/sections/custom-rows/color-select.reel/color-select.js | |
parent | 939cb7eccb8a5ec655fbde8b470894d293832307 (diff) | |
parent | 82ed48cc48ae1f8163021a0998e00d87da396d65 (diff) | |
download | ninja-e67000c704e284f4ab9b50c845853988272ce800.tar.gz |
Merge branch 'Timeline-main' into Timeline-newdoc
Diffstat (limited to 'js/panels/properties/sections/custom-rows/color-select.reel/color-select.js')
-rwxr-xr-x | js/panels/properties/sections/custom-rows/color-select.reel/color-select.js | 21 |
1 files changed, 21 insertions, 0 deletions
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, { | |||
17 | value: null | 17 | value: null |
18 | }, | 18 | }, |
19 | 19 | ||
20 | strokeChip: { | ||
21 | value: null | ||
22 | }, | ||
23 | |||
24 | fillChip: { | ||
25 | value: null | ||
26 | }, | ||
27 | |||
20 | handleChange: { | 28 | handleChange: { |
21 | value: function(e) { | 29 | value: function(e) { |
22 | 30 | ||
@@ -57,6 +65,19 @@ exports.ColorSelect = Montage.create(Component, { | |||
57 | // } | 65 | // } |
58 | 66 | ||
59 | } | 67 | } |
68 | }, | ||
69 | |||
70 | destroy: { | ||
71 | value: function() { | ||
72 | if(this.strokeChip) | ||
73 | { | ||
74 | this.strokeChip.destroy(); | ||
75 | } | ||
76 | if(this.fillChip) | ||
77 | { | ||
78 | this.fillChip.destroy(); | ||
79 | } | ||
80 | } | ||
60 | } | 81 | } |
61 | 82 | ||
62 | }); \ No newline at end of file | 83 | }); \ No newline at end of file |