turbolinks 0.5.1 → 0.5.2

data/lib/assets/javascripts/turbolinks.js.coffee

@@ -2,7 +2,7 @@ initialized    = false
 currentState   = null
 referer        = document.location.href
 assets         = []
-pageCache      = []
+pageCache      = {}
 createDocument = null
 
 visit = (url) ->
@@ -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
@@ -61,12 +61,13 @@ cacheCurrentPage = ->
   constrainPageCacheTo(10)
 
 constrainPageCacheTo = (limit) ->
-  delete pageCache[currentState.position - limit]
+  for own key, value of pageCache
+    pageCache[key] = null if key <= currentState.position - limit
 
-changePage = (title, body) ->
+changePage = (title, body, runScripts) ->
   document.title = title
   document.documentElement.replaceChild body, document.body
-  executeScriptTags()
+  executeScriptTags() if runScripts
   currentState = window.history.state
   triggerEvent 'page:change'
 
@@ -84,7 +85,7 @@ reflectRedirectedUrl = (xhr) ->
     window.history.replaceState currentState, '', location
 
 rememberCurrentUrl = ->
-  window.history.replaceState { turbolinks: true, position: window.history.length - 1 }, '', document.location.href
+  window.history.replaceState { turbolinks: true, position: Date.now() }, '', document.location.href
 
 rememberCurrentState = ->
   currentState = window.history.state
@@ -116,7 +117,8 @@ extractAssets = (doc) ->
   (node.src || node.href) for node in doc.head.childNodes when node.src or node.href
 
 assetsChanged = (doc)->
-  intersection(extractAssets(doc), assets).length != assets.length
+  extractedAssets = extractAssets doc
+  extractedAssets.length isnt assets.length or intersection(extractedAssets, assets).length != assets.length
 
 intersection = (a, b) ->
   [a, b] = [b, a] if a.length > b.length
@@ -124,7 +126,7 @@ intersection = (a, b) ->
 
 extractTitleAndBody = (doc) ->
   title = doc.querySelector 'title'
-  [ title?.textContent, doc.body ]
+  [ title?.textContent, doc.body, 'runScripts' ]
 
 browserCompatibleDocumentParser = ->
   createDocumentUsingParser = (html) ->
@@ -134,7 +136,7 @@ browserCompatibleDocumentParser = ->
     doc = document.implementation.createHTMLDocument ''
     doc.open 'replace'
     doc.write html
-    doc.close
+    doc.close()
     doc
 
   if window.DOMParser
@@ -154,19 +156,16 @@ installClickHandlerLast = (event) ->
 handleClick = (event) ->
   unless event.defaultPrevented
     link = extractLink event
-    if link.nodeName is 'A' and !ignoreClick(event, link)
+    if link?.nodeName is 'A' and !ignoreClick(event, link)
       visit link.href
       event.preventDefault()
 
 
 extractLink = (event) ->
   link = event.target
-  link = link.parentNode until link is document or link.nodeName is 'A'
+  link = link.parentNode until link is document or !link or link.nodeName is 'A'
   link
 
-samePageLink = (link) ->
-  link.href is document.location.href
-
 crossOriginLink = (link) ->
   location.protocol isnt link.protocol or location.host isnt link.host
 
@@ -183,11 +182,14 @@ noTurbolink = (link) ->
     link = link.parentNode
   ignore
 
+targetLink = (link) ->
+  link.target.length isnt 0
+
 nonStandardClick = (event) ->
   event.which > 1 or event.metaKey or event.ctrlKey or event.shiftKey or event.altKey
 
 ignoreClick = (event, link) ->
-  crossOriginLink(link) or anchoredLink(link) or nonHtmlLink(link) or noTurbolink(link) or nonStandardClick(event)
+  crossOriginLink(link) or anchoredLink(link) or nonHtmlLink(link) or noTurbolink(link) or targetLink(link) or nonStandardClick(event)
 
 
 browserSupportsPushState =

data/lib/turbolinks.rb

@@ -24,7 +24,7 @@ module Turbolinks
     initializer :turbolinks_xhr_headers do |config|
       ActionController::Base.class_eval do
         include XHRHeaders
-        after_filter :set_xhr_current_location
+        before_filter :set_xhr_current_location
       end
     end
   end

data/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;">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turbolinks
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
-dependencies: []
+date: 2012-11-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: coffee-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: david@loudthinking.com
 executables: []