upgrade masseuse to work on android browser better

max-mapper · Aug 22, 2012 · e5f2428 · e5f2428
1 parent 26b0e0c
commit e5f2428
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 deletions.
diff --git a/build/vk.js b/build/vk.js
@@ -2515,24 +2515,34 @@ require.define("masseuse",function(require,module,exports,__dirname,__filename,p
     var modal = catchModals(e)
     if (modal && modalCallback) modalCallback(modal)
   })
-  
+
   $(scope + 'input').live('tap', function(e) {
     e.preventDefault()
     var el = $(e.target)
-    var type = e.target.type
-    if (type === "checkbox") {
+    if (e.target.type === "checkbox") {
       el[0].checked = !el[0].checked
       el.attr('checked', el[0].checked)
+      // hack around webkit bug
+      var toggler = el.parent().find('.toggler')
+      redraw(toggler)
     } else {
       if (el.hasClass('disabled')) return false
+      var type = e.target.type
       // hack around mobile safari bug
-      if (type === "datetime") return setTimeout(function() { el.focus() }, 0)
+      // if (type === "datetime") return setTimeout(function() { el.focus() }, 0)
       el.focus()
     }
     return false
   })
 }
 
+// mobile browsers ughhhhhhhhh
+function redraw(obj) {
+  obj.hide()
+  obj.each(function() { this.offsetHeight })
+  obj.show()
+}
+
 function turnOffClick(elems) {
   elems.forEach(function(el) {
     $(el).live('click', function(e) {

diff --git a/lib/browserify/bundle.js b/lib/browserify/bundle.js
@@ -2515,24 +2515,34 @@ require.define("masseuse",function(require,module,exports,__dirname,__filename,p
     var modal = catchModals(e)
     if (modal && modalCallback) modalCallback(modal)
   })
-  
+
   $(scope + 'input').live('tap', function(e) {
     e.preventDefault()
     var el = $(e.target)
-    var type = e.target.type
-    if (type === "checkbox") {
+    if (e.target.type === "checkbox") {
       el[0].checked = !el[0].checked
       el.attr('checked', el[0].checked)
+      // hack around webkit bug
+      var toggler = el.parent().find('.toggler')
+      redraw(toggler)
     } else {
       if (el.hasClass('disabled')) return false
+      var type = e.target.type
       // hack around mobile safari bug
-      if (type === "datetime") return setTimeout(function() { el.focus() }, 0)
+      // if (type === "datetime") return setTimeout(function() { el.focus() }, 0)
       el.focus()
     }
     return false
   })
 }
 
+// mobile browsers ughhhhhhhhh
+function redraw(obj) {
+  obj.hide()
+  obj.each(function() { this.offsetHeight })
+  obj.show()
+}
+
 function turnOffClick(elems) {
   elems.forEach(function(el) {
     $(el).live('click', function(e) {

diff --git a/package.json b/package.json
@@ -6,6 +6,6 @@
   "dependencies": {
     "underscore": "1.3.3",
     "mustache": "0.4.0",
-    "masseuse": "0.0.1"
+    "masseuse": "0.0.2"
   }
 }