summaryrefslogtreecommitdiff
path: root/StoneIsland/platforms/ios/www/js/lib/view
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2015-12-11 01:54:35 -0600
committerJules Laplace <jules@okfoc.us>2015-12-11 01:54:35 -0600
commit20739f5f572e043aec1a4b25de63231c4c176ffe (patch)
tree2d0e3809aea69297d22651131275ba1989b76e11 /StoneIsland/platforms/ios/www/js/lib/view
parent13a66557666db25dd67bdc3eb0e52b11292045d1 (diff)
is_android check for touch events, rebuild ios
Diffstat (limited to 'StoneIsland/platforms/ios/www/js/lib/view')
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/view/Serializable.js2
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/view/View.js6
2 files changed, 4 insertions, 4 deletions
diff --git a/StoneIsland/platforms/ios/www/js/lib/view/Serializable.js b/StoneIsland/platforms/ios/www/js/lib/view/Serializable.js
index 921dc275..98aa8ce3 100755
--- a/StoneIsland/platforms/ios/www/js/lib/view/Serializable.js
+++ b/StoneIsland/platforms/ios/www/js/lib/view/Serializable.js
@@ -4,7 +4,7 @@ var SerializableView = View.extend({
"change select": "update_select",
"change [type=date]": "update_date",
"focus input": "focus_input",
- "touchstart .date-wrapper": "focus_date",
+ "click .date-wrapper": "focus_date",
"submit form": "save",
},
diff --git a/StoneIsland/platforms/ios/www/js/lib/view/View.js b/StoneIsland/platforms/ios/www/js/lib/view/View.js
index 70d2c7eb..fe145221 100755
--- a/StoneIsland/platforms/ios/www/js/lib/view/View.js
+++ b/StoneIsland/platforms/ios/www/js/lib/view/View.js
@@ -64,9 +64,9 @@ var View = (function($, _){
if (eventName === 'mouseenter' || eventName === 'mouseleave') {
continue
}
- if (eventName === 'click') {
- eventName = 'touchstart'
- }
+ if (is_android && eventName === 'click') {
+ eventName = 'touchstart'
+ }
}
if (selector === '') {
this.$el.on(eventName, method);