Merge pull request #235 from spudly/master

Improved click handler behavior. Fixes #233 and #234.
visionmedia · Mar 10, 2015 · 06cbb85 · 06cbb85
2 parents fa7d23c + 7f995b2
commit 06cbb85
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/index.js b/index.js
@@ -531,7 +531,7 @@
     // Ignore if tag has
     // 1. "download" attribute
     // 2. rel="external" attribute
-    if (el.getAttribute('download') || el.getAttribute('rel') === 'external') return;
+    if (el.hasAttribute('download') || el.getAttribute('rel') === 'external') return;
 
     // ensure non-hash for the same path
     var link = el.getAttribute('href');
@@ -556,10 +556,11 @@
     // same page
     var orig = path;
 
-    path = path.replace(base, '');
-    if (hashbang) path = path.replace('#!', '');
-
+    if (path.indexOf(base) === 0) {
+      path = path.substr(base.length);
+    }
 
+    if (hashbang) path = path.replace('#!', '');
 
     if (base && orig === path) return;