Don't scroll to top on partial replacement

turbolinks · May 10, 2015 · 6cadc8d · 6cadc8d
1 parent 7a8e631
commit 6cadc8d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/assets/javascripts/turbolinks.js.coffee b/lib/assets/javascripts/turbolinks.js.coffee
@@ -34,7 +34,7 @@ fetch = (url, options = {}) ->
     options.showProgressBar = false
     fetchReplacement url, options
   else
-    options.onLoadFunction = resetScrollPosition
+    options.onLoadFunction = resetScrollPosition unless options.change
     fetchReplacement url, options
 
 transitionCacheFor = (url) ->

diff --git a/test/javascript/turbolinks_visit_test.coffee b/test/javascript/turbolinks_visit_test.coffee
@@ -258,3 +258,11 @@ suite 'Turbolinks.visit()', ->
     @window.scrollTo(42, 42)
     @Turbolinks.pagesCached(0)
     @Turbolinks.visit('iframe2.html')
+
+  test "doesn't scroll to top with :change", (done) ->
+    @window.scrollTo(42, 42)
+    @document.addEventListener 'page:load', =>
+      assert.equal @window.pageXOffset, 42
+      assert.equal @window.pageYOffset, 42
+      done()
+    @Turbolinks.visit('iframe2.html', change: ['change'])