diff options
author | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
commit | 9f32d7e5454db3189209fc68a286a7fdb0c31fe8 (patch) | |
tree | a51c2bf67839a25158c30752b44fdea0eac28b9d /node_modules/montage/ui/check-input.js | |
parent | dc1e8dde18c40cf740bd2fe09165784e0d415fab (diff) | |
parent | 6d33345a9e609e36539d2efa25569f5eeb04a2af (diff) | |
download | ninja-9f32d7e5454db3189209fc68a286a7fdb0c31fe8.tar.gz |
Merge branch 'master' into pentool
Conflicts:
js/helper-classes/3D/view-utils.js
Diffstat (limited to 'node_modules/montage/ui/check-input.js')
-rw-r--r-- | node_modules/montage/ui/check-input.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/node_modules/montage/ui/check-input.js b/node_modules/montage/ui/check-input.js index 1621eb45..58f1cbc7 100644 --- a/node_modules/montage/ui/check-input.js +++ b/node_modules/montage/ui/check-input.js | |||
@@ -29,7 +29,7 @@ var CheckInput = exports.CheckInput = Montage.create(NativeControl, { | |||
29 | value: function() { | 29 | value: function() { |
30 | var pressComposer = this._pressComposer = PressComposer.create(); | 30 | var pressComposer = this._pressComposer = PressComposer.create(); |
31 | this.addComposer(pressComposer); | 31 | this.addComposer(pressComposer); |
32 | pressComposer.addEventListener("pressstart", this, false); | 32 | pressComposer.addEventListener("pressStart", this, false); |
33 | pressComposer.addEventListener("press", this, false); | 33 | pressComposer.addEventListener("press", this, false); |
34 | } | 34 | } |
35 | }, | 35 | }, |
@@ -82,7 +82,7 @@ var CheckInput = exports.CheckInput = Montage.create(NativeControl, { | |||
82 | 82 | ||
83 | // Handlers | 83 | // Handlers |
84 | 84 | ||
85 | handlePressstart: { | 85 | handlePressStart: { |
86 | value: function(event) { | 86 | value: function(event) { |
87 | this._shouldFakeCheck = event.defaultPrevented; | 87 | this._shouldFakeCheck = event.defaultPrevented; |
88 | } | 88 | } |