diff options
author | Ananya Sen | 2012-06-19 11:00:49 -0700 |
---|---|---|
committer | Ananya Sen | 2012-06-19 11:00:49 -0700 |
commit | f1d8401aeb84e0eb0680caf72878dae26fd78a37 (patch) | |
tree | 31771ccaf3d1e2ddf01fa9605438d20be0d155d7 /js/panels/color/colortoolbar.reel | |
parent | 9ea2610cec6569e7b7d5268b6c65bbf94c4753e5 (diff) | |
parent | 483ad57efcd6475776f580c3af5b60e6deeaf781 (diff) | |
download | ninja-f1d8401aeb84e0eb0680caf72878dae26fd78a37.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'js/panels/color/colortoolbar.reel')
-rwxr-xr-x | js/panels/color/colortoolbar.reel/colortoolbar.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/color/colortoolbar.reel/colortoolbar.js b/js/panels/color/colortoolbar.reel/colortoolbar.js index 6b8e476b..bf4d307f 100755 --- a/js/panels/color/colortoolbar.reel/colortoolbar.js +++ b/js/panels/color/colortoolbar.reel/colortoolbar.js | |||
@@ -108,7 +108,7 @@ exports.ColorToolbar = Montage.create(Component, { | |||
108 | color.mode = e._event.colorMode; | 108 | color.mode = e._event.colorMode; |
109 | this.application.ninja.colorController.colorModel[e._event.colorMode] = color; | 109 | this.application.ninja.colorController.colorModel[e._event.colorMode] = color; |
110 | } else { | 110 | } else { |
111 | this.application.ninja.colorController.colorModel.applyNoColor(); | 111 | this.application.ninja.colorController.colorModel.applyNoColor(false); |
112 | } | 112 | } |
113 | this.application.ninja.colorController.colorModel.input = 'chip'; | 113 | this.application.ninja.colorController.colorModel.input = 'chip'; |
114 | }.bind(this)); | 114 | }.bind(this)); |
@@ -125,7 +125,7 @@ exports.ColorToolbar = Montage.create(Component, { | |||
125 | color.mode = e._event.colorMode; | 125 | color.mode = e._event.colorMode; |
126 | this.application.ninja.colorController.colorModel[e._event.colorMode] = color; | 126 | this.application.ninja.colorController.colorModel[e._event.colorMode] = color; |
127 | } else { | 127 | } else { |
128 | this.application.ninja.colorController.colorModel.applyNoColor(); | 128 | this.application.ninja.colorController.colorModel.applyNoColor(false); |
129 | } | 129 | } |
130 | this.application.ninja.colorController.colorModel.input = 'chip'; | 130 | this.application.ninja.colorController.colorModel.input = 'chip'; |
131 | }.bind(this)); | 131 | }.bind(this)); |