diff options
| author | Jonathan Duran | 2012-06-19 08:40:26 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-19 08:40:26 -0700 |
| commit | 6f25a2e70079de6bcbb8c3411ddef88c2ed1ea39 (patch) | |
| tree | 253e5f6dd5923218e3155f78fa67ff3e43de0ebc /js/panels/color/colortoolbar.reel | |
| parent | b51c9448bc187f9bfa3ab39c366657ec2bb9e2fb (diff) | |
| parent | 483ad57efcd6475776f580c3af5b60e6deeaf781 (diff) | |
| download | ninja-6f25a2e70079de6bcbb8c3411ddef88c2ed1ea39.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
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)); |