diff options
| author | Eric Guzman | 2012-06-19 01:20:36 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-06-19 01:20:36 -0700 |
| commit | 2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch) | |
| tree | f69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/panels/color/colortoolbar.reel/colortoolbar.js | |
| parent | 5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff) | |
| parent | 1007cbf983ad0f2460a4122a492a96023fdb4439 (diff) | |
| download | ninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz | |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts:
js/stage/binding-view.reel/binding-view.js
Diffstat (limited to 'js/panels/color/colortoolbar.reel/colortoolbar.js')
| -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)); |