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/colorchippopup.reel/colorchippopup.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/colorchippopup.reel/colorchippopup.js')
| -rwxr-xr-x | js/panels/color/colorchippopup.reel/colorchippopup.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/color/colorchippopup.reel/colorchippopup.js b/js/panels/color/colorchippopup.reel/colorchippopup.js index 414be8b7..923beca9 100755 --- a/js/panels/color/colorchippopup.reel/colorchippopup.js +++ b/js/panels/color/colorchippopup.reel/colorchippopup.js | |||
| @@ -43,8 +43,8 @@ exports.ColorChipPopup = Montage.create(Component, { | |||
| 43 | // | 43 | // |
| 44 | setNoColor: { | 44 | setNoColor: { |
| 45 | enumerable: true, | 45 | enumerable: true, |
| 46 | value: function (e) { | 46 | value: function (code) { |
| 47 | this.colorManager.applyNoColor(); | 47 | this.colorManager.applyNoColor(code); |
| 48 | } | 48 | } |
| 49 | }, | 49 | }, |
| 50 | //////////////////////////////////////////////////////////////////// | 50 | //////////////////////////////////////////////////////////////////// |