diff options
| author | Valerio Virgillito | 2012-06-18 22:22:57 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-06-18 22:22:57 -0700 |
| commit | 795a6908ccac21b773490954371f2c4def9e5379 (patch) | |
| tree | 68db12b1fc96286cc8ff78034c7b155df71f9ef3 /js/panels/color/colortoolbar.reel | |
| parent | ad6f78493295c9c7b4c11cd6a895dd5cc8e207f7 (diff) | |
| parent | 918a4f5870e972b6e4e301c3237e065a1ffd26f5 (diff) | |
| download | ninja-795a6908ccac21b773490954371f2c4def9e5379.tar.gz | |
Merge branch 'refs/heads/master' into montage-v11-integration
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)); |