diff options
| author | Eric Guzman | 2012-04-02 15:36:08 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-04-02 15:36:08 -0700 |
| commit | 0241bf331b7e06e206a54be441edf2f4c7261f63 (patch) | |
| tree | b7e2f9cad73eed4fc616cf1841cd0be02bd955d4 /js/controllers/color-controller.js | |
| parent | dde5b5054f93db493e5d4d502e677f5781334b08 (diff) | |
| parent | c6de22bf42be90b403491b5f87b1818d9020310c (diff) | |
| download | ninja-0241bf331b7e06e206a54be441edf2f4c7261f63.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/controllers/color-controller.js')
| -rwxr-xr-x | js/controllers/color-controller.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/js/controllers/color-controller.js b/js/controllers/color-controller.js index 53573baf..c6d664cf 100755 --- a/js/controllers/color-controller.js +++ b/js/controllers/color-controller.js | |||
| @@ -198,7 +198,6 @@ exports.ColorController = Montage.create(Component, { | |||
| 198 | handleChange: { | 198 | handleChange: { |
| 199 | enumerable: true, | 199 | enumerable: true, |
| 200 | value: function (e) { | 200 | value: function (e) { |
| 201 | |||
| 202 | // | 201 | // |
| 203 | var actionEvent, color, input = e._event.input, panelMode, mode = e._event.mode; | 202 | var actionEvent, color, input = e._event.input, panelMode, mode = e._event.mode; |
| 204 | if (this.colorView) { | 203 | if (this.colorView) { |