aboutsummaryrefslogtreecommitdiff
path: root/js/panels/color/colorchippopup.reel/colorchippopup.js
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-19 00:45:26 -0700
committerArmen Kesablyan2012-06-19 00:45:26 -0700
commitc59eb371559a3061ce53223e249ca97daace5968 (patch)
treef9540e26c0f273d35f92010605da65dd85bbe70c /js/panels/color/colorchippopup.reel/colorchippopup.js
parent0f040acabfb7a4bf3138debec5aff869487ceb11 (diff)
parent918a4f5870e972b6e4e301c3237e065a1ffd26f5 (diff)
downloadninja-c59eb371559a3061ce53223e249ca97daace5968.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/panels/color/colorchippopup.reel/colorchippopup.js')
-rwxr-xr-xjs/panels/color/colorchippopup.reel/colorchippopup.js4
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 ////////////////////////////////////////////////////////////////////