Merge pull request turbolinks#147 from YasuOza/non_rails_compatible

Compatible for non rails environment.
evenchange4 · Dec 16, 2012 · ea5122a · ea5122a
2 parents 00b9971 + dc79217
commit ea5122a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/assets/javascripts/turbolinks.js.coffee b/lib/assets/javascripts/turbolinks.js.coffee
@@ -87,7 +87,7 @@ reflectNewUrl = (url) ->
     window.history.pushState { turbolinks: true, position: currentState.position + 1 }, '', url
 
 reflectRedirectedUrl = (xhr) ->
-  unless (location = xhr.getResponseHeader 'X-XHR-Current-Location') is document.location.pathname + document.location.search
+  if (location = xhr.getResponseHeader 'X-XHR-Current-Location') and location isnt document.location.pathname + document.location.search
     window.history.replaceState currentState, '', location + document.location.hash
 
 rememberCurrentUrl = ->