Merge branch 'fix-trailing-hash'

Closes defunkt#506
webhacking · Apr 2, 2015 · 65c4f34 · 65c4f34
2 parents 94d1911 + ad02f0a
commit 65c4f34
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/jquery.pjax.js b/jquery.pjax.js
@@ -226,7 +226,7 @@ function pjax(options) {
     }
 
     var url = parseURL(settings.url)
-    url.hash = hash
+    if (hash) url.hash = hash
     options.requestUrl = stripInternalParams(url.href)
   }
 

diff --git a/test/unit/pjax.js b/test/unit/pjax.js
@@ -205,7 +205,7 @@ if ($.support.pjax) {
     })
   })
 
-  asyncTest("GET data is appended to query string", 5, function() {
+  asyncTest("GET data is appended to query string", 6, function() {
     var data = { foo: 1, bar: 2 }
 
     navigate(this.frame)
@@ -226,10 +226,11 @@ if ($.support.pjax) {
       // URL is set immediately
       equal(frame.location.pathname, "/env.html")
       equal(frame.location.search, "?foo=1&bar=2")
+      equal(frame.location.href.indexOf("#"), -1)
     }, 0)
   })
 
-  asyncTest("GET data is merged into query string", 5, function() {
+  asyncTest("GET data is merged into query string", 6, function() {
     var data = { bar: 2 }
 
     navigate(this.frame)
@@ -250,6 +251,7 @@ if ($.support.pjax) {
       // URL is set immediately
       equal(frame.location.pathname, "/env.html")
       equal(frame.location.search, "?foo=1&bar=2")
+      equal(frame.location.href.indexOf("#"), -1)
     }, 0)
   })
 

diff --git a/test/unit/pjax_fallback.js b/test/unit/pjax_fallback.js
@@ -141,7 +141,7 @@ asyncTest("scrolls to anchor at top page"+s, function() {
 
   if (disabled) {
     equal(frame.location.pathname, "/home.html")
-    equal(frame.location.hash, "")
+    equal(frame.location.href.indexOf("#"), -1)
   } else {
     equal(frame.location.pathname, "/anchor.html")
     equal(frame.location.hash, "#top")