Make Turbolinks.visit() with :change scroll to the #hash by default

Fixes #589.
turbolinks · Oct 4, 2015 · 01ec408 · tortuetorche · Oct 5, 2015 · Thibaut
1 parent 8446ca1
commit 01ec408
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/assets/javascripts/turbolinks.coffee b/lib/assets/javascripts/turbolinks.coffee
@@ -47,7 +47,7 @@ fetch = (url, options = {}) ->
     options.showProgressBar = false
     options.scroll = false
   else
-    options.scroll ?= false if options.change
+    options.scroll ?= (url.hash || false) if options.change
 
   fetchReplacement url, options
 
@@ -264,6 +264,8 @@ updateScrollPosition = (position) ->
   if Array.isArray(position)
     window.scrollTo position[0], position[1]
   else if position isnt false
+    if typeof position is 'string' and (element = document.querySelector(position))
+      element.scrollIntoView()
     if document.location.hash
       document.location.href = document.location.href
       rememberCurrentUrlAndState()

diff --git a/test/javascript/turbolinks_visit_test.coffee b/test/javascript/turbolinks_visit_test.coffee
@@ -459,6 +459,12 @@ suite 'Turbolinks.visit()', ->
     @Turbolinks.enableTransitionCache()
     @Turbolinks.visit('iframe2.html')
 
+  test "scroll to #anchor with :change", (done) ->
+    @document.addEventListener 'page:partial-load', =>
+      assert.closeTo @window.pageYOffset, @$('#change').offsetTop, 100
+      done()
+    @Turbolinks.visit('iframe2.html#change', change: ['change'])
+
   test "doesn't scroll to top with :change", (done) ->
     @window.scrollTo(42, 42)
     @document.addEventListener 'page:partial-load', =>