Merge remote-tracking branch 'origin/dev'

CHANGELOG.md

@@ -1,3 +1,7 @@
+Changed in 2.3.1 and 2.3.2
+======
+* Patches for onTapLink
+
 Changed in 2.3.0
 ======
 * Moved all client-side dependencies to use bower and restructured project to make sense of this change

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "lavaca",
   "main": "lavaca.js",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "homepage": "https://github.com/mutualmobile/lavaca",
   "authors": [
     "Mutual Mobile <[email protected]>"

package.json

@@ -1,7 +1,7 @@
 {
   "name": "lavaca",
   "description": "A curated collection of tools built for mobile.",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "homepage": "https://github.com/mutualmobile/lavaca",
   "author": {
     "name": "mutualmobile",

src/mvc/Application.js

@@ -121,22 +121,19 @@ define(function(require) {
           rel = link.attr('rel'),
           target = link.attr('target'),
           isExternal = link.is('[data-external]') || _isExternal(url),
-          preventClick = function() {
-            if ($(document.body).hammer) {
-              link.one('click', _stopEvent);
-            }
-          };
-
+          metaKey = e.type === 'tap' ? (e.gesture.srcEvent.ctrlKey || e.gesture.srcEvent.metaKey) : (e.ctrlKey || e.metaKey);
+      if (metaKey) {
+        target = metaKey ? '_blank' : (target ? target : '_self');
+      }
       if (!defaultPrevented) {
         if (Device.isCordova() && target) {
           e.preventDefault();
-          preventClick();
           window.open(url, target || '_blank');
-        } else if (isExternal || target || (e.ctrlKey || e.metaKey)) {
+        } else if (isExternal || target) {
+          window.open(url, target);
           return true;
         } else {
           e.preventDefault();
-          preventClick();
           if (rel === 'back') {
             History.back();
           } else if (rel === 'force-back' && url) {
@@ -151,9 +148,7 @@ define(function(require) {
             this.router.exec(url).error(this.onInvalidRoute);
           }
         }
-      } else {
-        preventClick();
-      }
+      }
     },
     /**
      * Makes an AJAX request if the user is online. If the user is offline, the returned
@@ -233,6 +228,7 @@ define(function(require) {
       if ($body.hammer) {
         $body = $body.hammer();
         type = 'tap';
+        $body.on('click', 'a', _stopEvent);
       }
       $body
         .on(type, '.ui-blocker', _stopEvent)