diff options
| author | Nivesh Rajbhandari | 2012-04-16 16:06:24 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-04-16 16:06:24 -0700 |
| commit | c253192a08b499ea7be46fa5438d273e51f7ec5a (patch) | |
| tree | 18a1f0e3679c0eb993a9dedb537035d3861f49ac /js/controllers/color-controller.js | |
| parent | e19376c54eedd1f1c457ba405b2f110be376a559 (diff) | |
| parent | 4b900ea5cd6bb77eb30cec8c03b9ec9fa662c1e9 (diff) | |
| download | ninja-c253192a08b499ea7be46fa5438d273e51f7ec5a.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
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) { |