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/colorchippopup.reel/colorchippopup.js | |
| 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/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 | //////////////////////////////////////////////////////////////////// |