Merge pull request turbolinks#114 from YasuOza/location_reload_when_a…

…ssetChanged document.location.reload() when assetsChanged
evenchange4 · Nov 26, 2012 · 3ddba5f · 3ddba5f
2 parents 2360728 + 2c80b5a
commit 3ddba5f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/assets/javascripts/turbolinks.js.coffee b/lib/assets/javascripts/turbolinks.js.coffee
@@ -26,7 +26,7 @@ fetchReplacement = (url) ->
     doc = createDocument xhr.responseText
 
     if assetsChanged doc
-      document.location.href = url
+      document.location.reload()
     else
       changePage extractTitleAndBody(doc)...
       reflectRedirectedUrl xhr

diff --git a/test/index.html b/test/index.html
@@ -19,6 +19,7 @@
     <li><a href="/reload.html"><span>Asset Change</span></a></li>
     <li><a href="/dummy.gif?12345">Query Param Image Link</a></li>
     <li><a href="#">Hash link</a></li>
+    <li><a href="/reload.html#foo">Asset Change with hash link</a></li>
   </ul>
 
   <div style="background:#ccc;height:5000px;width:200px;">