diff options
| author | Jonathan Duran | 2012-03-29 07:27:27 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-03-29 07:27:27 -0700 |
| commit | ab730848419a0b72c4c2747a3c928f2c8cc763e7 (patch) | |
| tree | 6b48b82604e194016ca048ad912f8015de719999 /js/controllers/color-controller.js | |
| parent | 06f247d881f4cfd790d635c6e310ae7f97724339 (diff) | |
| parent | 3fd2cdb59027b3f973b9165db9db4fdd22026941 (diff) | |
| download | ninja-ab730848419a0b72c4c2747a3c928f2c8cc763e7.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
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) { |