Visit#hasSnapshot returns false if the snapshot doesn't contain the a…

…nchor we're visiting
Roy-Wanyoike · Sep 23, 2015 · 3fa127b · 3fa127b
1 parent 46d64d1
commit 3fa127b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/src/turbolinks/controller.coffee b/src/turbolinks/controller.coffee
@@ -95,11 +95,14 @@ class Turbolinks.Controller
     @cache.put(@lastRenderedLocation, snapshot)
 
   restoreSnapshotForLocation: (location) ->
-    if snapshot = @cache.get(location)
+    if snapshot = @getSnapshotForLocation(location)
       @view.loadSnapshot(snapshot)
       @notifyApplicationAfterSnapshotLoad()
       true
 
+  getSnapshotForLocation: (location) ->
+    @cache.get(location)
+
   # Scrolling
 
   scrollToAnchor: (anchor) ->

diff --git a/src/turbolinks/snapshot.coffee b/src/turbolinks/snapshot.coffee
@@ -12,6 +12,9 @@ class Turbolinks.Snapshot
     @head = head
     @body = body
 
+  hasAnchor: (anchor) ->
+    @body.querySelector(anchor)?
+
   hasSameTrackedHeadElementsAsSnapshot: (snapshot) ->
     @getTrackedHeadElementSet().isEqualTo(snapshot.getTrackedHeadElementSet())
 

diff --git a/src/turbolinks/visit.coffee b/src/turbolinks/visit.coffee
@@ -50,7 +50,11 @@ class Turbolinks.Visit
       @request.send()
 
   hasSnapshot: ->
-    @controller.hasSnapshotForLocation(@location)
+    if snapshot = @controller.getSnapshotForLocation(location)
+      if @location.anchor?
+        snapshot.hasAnchor(@location.anchor)
+      else
+        true
 
   restoreSnapshot: ->
     if @hasSnapshot() and not @snapshotRestored