Merge branch 'back-from-error'

mislav · mislav · commit 6bb4cc53a375 · 2014-11-21T14:13:43.000-08:00
Closes #437
diff --git a/jquery.pjax.js b/jquery.pjax.js
@@ -398,7 +398,7 @@ function pjaxReload(container, options) {
 //
 // Returns nothing.
 function locationReplace(url) {
-  window.history.replaceState(null, "", "#")
+  window.history.replaceState(null, "", pjax.state.url)
   window.location.replace(url)
 }
 
diff --git a/test/app.rb b/test/app.rb
@@ -83,6 +83,11 @@ def title(str)
   erb :boom, :layout => !pjax?
 end
 
+get '/boom_sans_pjax.html' do
+  status 500
+  erb :boom_sans_pjax, :layout => false
+end
+
 get '/:page.html' do
   erb :"#{params[:page]}", :layout => !pjax?
 end
diff --git a/test/unit/pjax.js b/test/unit/pjax.js
@@ -1240,4 +1240,29 @@ if ($.support.pjax) {
       })
     })
   })
+
+  asyncTest("handles going back to page after loading an error page", function() {
+    var frame = this.frame
+    var iframe = this.iframe
+
+    equal(frame.location.pathname, "/home.html")
+    equal(frame.document.title, "Home")
+
+    $(iframe).one("load", function() {
+
+      window.iframeLoad = function() {
+        equal(frame.location.pathname, "/home.html")
+        equal(frame.document.title, "Home")
+
+        start()
+      }
+
+      frame.history.back()
+    })
+
+    frame.$.pjax({
+      url: "boom_sans_pjax.html",
+      container: "#main"
+    })
+  })
 }
diff --git a/test/views/boom_sans_pjax.erb b/test/views/boom_sans_pjax.erb
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>500 sans pjax</title>
+</head>
+<body>
+  <div id="main">
+    <p>500 sans pjax</p>
+  </div>
+</body>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -398,7 +398,7 @@ function pjaxReload(container, options) {`
`398`	`398`	`//`
`399`	`399`	`// Returns nothing.`
`400`	`400`	`function locationReplace(url) {`
`401`		`- window.history.replaceState(null, "", "#")`
	`401`	`+ window.history.replaceState(null, "", pjax.state.url)`
`402`	`402`	`window.location.replace(url)`
`403`	`403`	`}`
`404`	`404`