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/colorchippopup.reel/colorchippopup.js | |
| parent | b51c9448bc187f9bfa3ab39c366657ec2bb9e2fb (diff) | |
| parent | 483ad57efcd6475776f580c3af5b60e6deeaf781 (diff) | |
| download | ninja-6f25a2e70079de6bcbb8c3411ddef88c2ed1ea39.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
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 | //////////////////////////////////////////////////////////////////// |