diff options
author | Valerio Virgillito | 2012-04-18 13:48:51 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-04-18 13:48:51 -0700 |
commit | 2e04af953463643791f6362bd8ef4c6ba190abfa (patch) | |
tree | d07aaf646091ddf9dad5b030a7905055fd323490 /node_modules/montage/ui/check-input.js | |
parent | 616a8532099fec2a15855eac97cd85cb60c4451c (diff) | |
download | ninja-2e04af953463643791f6362bd8ef4c6ba190abfa.tar.gz |
Squashed commit of the following:
commit 2054551bfb01a0f4ca2e138b9d724835462d45cd
Merge: 765c2da 616a853
Author: Valerio Virgillito <valerio@motorola.com>
Date: Wed Apr 18 13:48:21 2012 -0700
Merge branch 'refs/heads/master' into integration
commit 765c2da8e1aa03550caf42b2bd5f367555ad2843
Author: Valerio Virgillito <valerio@motorola.com>
Date: Tue Apr 17 15:29:41 2012 -0700
updating the picasa carousel
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
commit 9484f1c82b81e27edf2dc0a1bcc1fa3b12077406
Merge: d27f2df cacb4a2
Author: Valerio Virgillito <valerio@motorola.com>
Date: Tue Apr 17 15:03:50 2012 -0700
Merge branch 'refs/heads/master' into integration
commit d27f2df4d846064444263d7832d213535962abe7
Author: Valerio Virgillito <valerio@motorola.com>
Date: Wed Apr 11 10:39:36 2012 -0700
integrating new picasa carousel component
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
commit 6f98384c9ecbc8abe55ccfe1fc25a0c7ce22c493
Author: Valerio Virgillito <valerio@motorola.com>
Date: Tue Apr 10 14:33:00 2012 -0700
fixed the text area case issue
Text area was renamed from TextArea to Textarea
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
commit 1e83e26652266136802bc7af930379c1ecd631a6
Author: Valerio Virgillito <valerio@motorola.com>
Date: Mon Apr 9 22:10:45 2012 -0700
integrating montage v0.8 into ninja.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
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 | } |