turbolinks 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9287368c8706ded534c851a89ad71ea39b090a64
-  data.tar.gz: ecea87430693e024274720d50e3eea02b43cfe1a
+  metadata.gz: 5fba03f6769899590a73f8d2f6f1e2b1756335cc
+  data.tar.gz: fcb4ee4559b15a8d3037ccd75636a8de9513365e
 SHA512:
-  metadata.gz: dbe8bda0952f6f8f19fc8e0192a1c8305286c14393db2c3a2f5cde40839e1e390d8f301948da3fcbbbdf802960ba28ec6ed414a55f6aeb7dd54be250a4a20d31
-  data.tar.gz: d0de51d589fc9d6553d4815f8a4e2593a3a7cc7a63e461f5c24f5765347d0e1153a592328f587e31ffa8c762840f7cc6fdd24ed186d0eb2642763211f9c86fd0
+  metadata.gz: 0cf63e984ac0cfed94831716ecfaf3db1be2045e83e07d9b8e4304ce6639135ddee36876b6c945fcec564730d33bb5f00e1c66d456218bc0db054568a2ef7790
+  data.tar.gz: 6733c1c8dc08e44e4271962e50ed4891ed96e0ba30a531c08025b001ecf700d0b4c5ef082891d62391d91c9a8f0bf81f7ce3e1838bf8774b582302289d42660c

data/README.md

@@ -33,8 +33,9 @@ With Turbolinks pages will change without a full reload, so you can't rely on `D
 * `page:before-change` a Turbolinks-enabled link has been clicked *(see below for more details)*
 * `page:fetch` starting to fetch a new target page
 * `page:receive` the page has been fetched from the server, but not yet parsed
-* `page:change` the page has been parsed and changed to the new version and on DOMContentLoaded
-* `page:update` is triggered whenever page:change is PLUS on jQuery's ajaxSucess, if jQuery is available (otherwise you can manually trigger it when calling XMLHttpRequest in your own code)
+* `page:before-unload` the page has been parsed and is about to be changed
+* `page:change` the page has been changed to the new version (and on DOMContentLoaded)
+* `page:update` is triggered alongside both page:change and jQuery's ajaxSuccess (if jQuery is available - otherwise you can manually trigger it when calling XMLHttpRequest in your own code)
 * `page:load` is fired at the end of the loading process.
 
 Handlers bound to the `page:before-change` event may return `false`, which will cancel the Turbolinks process.
@@ -42,6 +43,7 @@ Handlers bound to the `page:before-change` event may return `false`, which will
 By default, Turbolinks caches 10 of these page loads. It listens to the [popstate](https://developer.mozilla.org/en-US/docs/DOM/Manipulating_the_browser_history#The_popstate_event) event and attempts to restore page state from the cache when it's triggered. When `popstate` is fired the following process happens:
 
 ***Restore* a cached page from the client-side cache:**
+* `page:before-unload` page has been fetched from the cache and is about to be changed
 * `page:change` page has changed to the cached page.
 * `page:restore` is fired at the end of restore process.
 

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

@@ -10,6 +10,16 @@ referer                 = null
 createDocument          = null
 xhr                     = null
 
+EVENTS =
+  BEFORE_CHANGE:  'page:before-change'
+  FETCH:          'page:fetch'
+  RECEIVE:        'page:receive'
+  CHANGE:         'page:change'
+  UPDATE:         'page:update'
+  LOAD:           'page:load'
+  RESTORE:        'page:restore'
+  BEFORE_UNLOAD:  'page:before-unload'
+  EXPIRE:         'page:expire'
 
 fetch = (url) ->
   url = new ComponentUrl url
@@ -30,8 +40,8 @@ transitionCacheFor = (url) ->
 enableTransitionCache = (enable = true) ->
   transitionCacheEnabled = enable
 
-fetchReplacement = (url, onLoadFunction = =>) ->  
-  triggerEvent 'page:fetch', url: url.absolute
+fetchReplacement = (url, onLoadFunction = =>) ->
+  triggerEvent EVENTS.FETCH, url: url.absolute
 
   xhr?.abort()
   xhr = new XMLHttpRequest
@@ -40,7 +50,7 @@ fetchReplacement = (url, onLoadFunction = =>) ->
   xhr.setRequestHeader 'X-XHR-Referer', referer
 
   xhr.onload = ->
-    triggerEvent 'page:receive', url: url.absolute
+    triggerEvent EVENTS.RECEIVE, url: url.absolute
 
     if doc = processResponse()
       reflectNewUrl url
@@ -48,7 +58,7 @@ fetchReplacement = (url, onLoadFunction = =>) ->
       manuallyTriggerHashChangeForFirefox()
       reflectRedirectedUrl()
       onLoadFunction()
-      triggerEvent 'page:load'
+      triggerEvent EVENTS.LOAD
     else
       document.location.href = url.absolute
 
@@ -61,7 +71,7 @@ fetchHistory = (cachedPage) ->
   xhr?.abort()
   changePage cachedPage.title, cachedPage.body
   recallScrollPosition cachedPage
-  triggerEvent 'page:restore'
+  triggerEvent EVENTS.RESTORE
 
 
 cacheCurrentPage = ->
@@ -89,24 +99,26 @@ constrainPageCacheTo = (limit) ->
   .sort (a, b) -> b - a
 
   for key in pageCacheKeys when pageCache[key].cachedAt <= cacheTimesRecentFirst[limit]
-    triggerEvent 'page:expire', pageCache[key]
+    triggerEvent EVENTS.EXPIRE, pageCache[key]
     delete pageCache[key]
 
 changePage = (title, body, csrfToken, runScripts) ->
+  triggerEvent EVENTS.BEFORE_UNLOAD
   document.title = title
   document.documentElement.replaceChild body, document.body
   CSRFToken.update csrfToken if csrfToken?
   setAutofocusElement()
   executeScriptTags() if runScripts
   currentState = window.history.state
-  triggerEvent 'page:change'
-  triggerEvent 'page:update'
+  triggerEvent EVENTS.CHANGE
+  triggerEvent EVENTS.UPDATE
 
 executeScriptTags = ->
   scripts = Array::slice.call document.body.querySelectorAll 'script:not([data-turbolinks-eval="false"])'
   for script in scripts when script.type in ['', 'text/javascript']
     copy = document.createElement 'script'
     copy.setAttribute attr.name, attr.value for attr in script.attributes
+    copy.async = false unless script.hasAttribute 'async'
     copy.appendChild document.createTextNode script.innerHTML
     { parentNode, nextSibling } = script
     parentNode.removeChild script
@@ -164,29 +176,39 @@ resetScrollPosition = ->
     window.scrollTo 0, 0
 
 
+clone = (original) ->
+  return original if not original? or typeof original isnt 'object'
+  copy = new original.constructor()
+  copy[key] = clone value for key, value of original
+  copy
+
 popCookie = (name) ->
   value = document.cookie.match(new RegExp(name+"=(\\w+)"))?[1].toUpperCase() or ''
   document.cookie = name + '=; expires=Thu, 01-Jan-70 00:00:01 GMT; path=/'
   value
 
 triggerEvent = (name, data) ->
+  if typeof Prototype isnt 'undefined'
+    Event.fire document, name, data, true
+
   event = document.createEvent 'Events'
   event.data = data if data
   event.initEvent name, true, true
   document.dispatchEvent event
 
-pageChangePrevented = ->
-  !triggerEvent 'page:before-change'
+pageChangePrevented = (url) ->
+  !triggerEvent EVENTS.BEFORE_CHANGE, url: url
 
 processResponse = ->
   clientOrServerError = ->
     400 <= xhr.status < 600
 
   validContent = ->
-    xhr.getResponseHeader('Content-Type').match /^(?:text\/html|application\/xhtml\+xml|application\/xml)(?:;|$)/
+    (contentType = xhr.getResponseHeader('Content-Type'))? and 
+      contentType.match /^(?:text\/html|application\/xhtml\+xml|application\/xml)(?:;|$)/
 
   extractTrackAssets = (doc) ->
-    for node in doc.head.childNodes when node.getAttribute?('data-turbolinks-track')?
+    for node in doc.querySelector('head').childNodes when node.getAttribute?('data-turbolinks-track')?
       node.getAttribute('src') or node.getAttribute('href')
 
   assetsChanged = (doc) ->
@@ -205,7 +227,7 @@ processResponse = ->
 
 extractTitleAndBody = (doc) ->
   title = doc.querySelector 'title'
-  [ title?.textContent, removeNoscriptTags(doc.body), CSRFToken.get(doc).token, 'runScripts' ]
+  [ title?.textContent, removeNoscriptTags(doc.querySelector('body')), CSRFToken.get(doc).token, 'runScripts' ]
 
 CSRFToken =
   get: (doc = document) ->
@@ -233,6 +255,15 @@ browserCompatibleDocumentParser = ->
     doc.close()
     doc
 
+  createDocumentUsingFragment = (html) ->
+    head = html.match(/<head[^>]*>([\s\S.]*)<\/head>/i)?[0] or '<head></head>'
+    body = html.match(/<body[^>]*>([\s\S.]*)<\/body>/i)?[0] or '<body></body>'
+    htmlWrapper = document.createElement 'html'
+    htmlWrapper.innerHTML = head + body
+    doc = document.createDocumentFragment()
+    doc.appendChild htmlWrapper
+    doc
+
   # Use createDocumentUsingParser if DOMParser is defined and natively
   # supports 'text/html' parsing (Firefox 12+, IE 10)
   #
@@ -243,16 +274,32 @@ browserCompatibleDocumentParser = ->
   #  - DOMParser isn't defined
   #  - createDocumentUsingParser returns null due to unsupported type 'text/html' (Chrome, Safari)
   #  - createDocumentUsingDOM doesn't create a valid HTML document (safeguarding against potential edge cases)
+  #
+  # Use createDocumentUsingFragment if the previously selected parser does not
+  # correctly parse <form> tags. (Safari 7.1+ - see github.com/rails/turbolinks/issues/408)
+  buildTestsUsing = (createMethod) ->
+    buildTest = (fallback, passes) ->
+      passes: passes()
+      fallback: fallback
+
+    structureTest = buildTest createDocumentUsingWrite, =>
+      (createMethod '<html><body><p>test')?.body?.childNodes.length is 1
+
+    formNestingTest = buildTest createDocumentUsingFragment, =>
+      (createMethod '<html><body><form></form><div></div></body></html>')?.body?.childNodes.length is 2
+
+    [structureTest, formNestingTest]
+
   try
     if window.DOMParser
-      testDoc = createDocumentUsingParser '<html><body><p>test'
+      docTests = buildTestsUsing createDocumentUsingParser
       createDocumentUsingParser
   catch e
-    testDoc = createDocumentUsingDOM '<html><body><p>test'
+    docTests = buildTestsUsing createDocumentUsingDOM
     createDocumentUsingDOM
   finally
-    unless testDoc?.body?.childNodes.length is 1
-      return createDocumentUsingWrite
+    for docTest in docTests
+      return docTest.fallback unless docTest.passes
 
 
 # The ComponentUrl class converts a basic URL string into an object
@@ -265,7 +312,7 @@ class ComponentUrl
     return @original if @original.constructor is ComponentUrl
     @_parse()
 
-  withoutHash: -> @href.replace @hash, ''
+  withoutHash: -> @href.replace(@hash, '').replace('#', '')
 
   # Intention revealing function alias
   withoutHashForIE10compatibility: -> @withoutHash()
@@ -293,6 +340,8 @@ class Link extends ComponentUrl
   constructor: (@link) ->
     return @link if @link.constructor is Link
     @original = @link.href
+    @originalElement = @link
+    @link = @link.cloneNode false
     super
 
   shouldIgnore: ->
@@ -306,14 +355,14 @@ class Link extends ComponentUrl
     @origin isnt (new ComponentUrl).origin
     
   _anchored: ->
-    ((@hash and @withoutHash()) is (current = new ComponentUrl).withoutHash()) or 
-      (@href is current.href + '#') 
+    (@hash.length > 0 or @href.charAt(@href.length - 1) is '#') and
+      (@withoutHash() is (new ComponentUrl).withoutHash())
 
   _nonHtml: ->
     @pathname.match(/\.[a-z]+$/g) and not @pathname.match(new RegExp("\\.(?:#{Link.HTML_EXTENSIONS.join('|')})?$", 'g'))
 
   _optOut: ->
-    link = @link
+    link = @originalElement
     until ignore or link is document
       ignore = link.getAttribute('data-no-turbolink')?
       link = link.parentNode
@@ -340,7 +389,7 @@ class Click
     return if @event.defaultPrevented
     @_extractLink()
     if @_validForTurbolinks()
-      visit @link.href unless pageChangePrevented()
+      visit @link.href unless pageChangePrevented(@link.absolute)
       @event.preventDefault() 
 
   _extractLink: ->
@@ -366,15 +415,15 @@ bypassOnLoadPopstate = (fn) ->
 
 installDocumentReadyPageEventTriggers = ->
   document.addEventListener 'DOMContentLoaded', ( ->
-    triggerEvent 'page:change'
-    triggerEvent 'page:update'
+    triggerEvent EVENTS.CHANGE
+    triggerEvent EVENTS.UPDATE
   ), true
 
 installJqueryAjaxSuccessPageUpdateTrigger = ->
   if typeof jQuery isnt 'undefined'
     jQuery(document).on 'ajaxSuccess', (event, xhr, settings) ->
       return unless jQuery.trim xhr.responseText
-      triggerEvent 'page:update'
+      triggerEvent EVENTS.UPDATE
 
 installHistoryChangeHandler = (event) ->
   if event.state?.turbolinks
@@ -433,4 +482,12 @@ else
 #   Turbolinks.enableTransitionCache()
 #   Turbolinks.allowLinkExtensions('md')
 #   Turbolinks.supported
-@Turbolinks = { visit, pagesCached, enableTransitionCache, allowLinkExtensions: Link.allowExtensions, supported: browserSupportsTurbolinks }
+#   Turbolinks.EVENTS
+@Turbolinks = {
+  visit,
+  pagesCached,
+  enableTransitionCache,
+  allowLinkExtensions: Link.allowExtensions,
+  supported: browserSupportsTurbolinks,
+  EVENTS: clone(EVENTS)
+}

data/lib/turbolinks/cookies.rb

@@ -1,10 +1,15 @@
 module Turbolinks
-  # Sets a request_method cookie containing the request method of the current request.
-  # The Turbolinks script will not initialize if this cookie is set to anything other than GET.
+  # For non-GET requests, sets a request_method cookie containing
+  # the request method of the current request. The Turbolinks script
+  # will not initialize if this cookie is set.
   module Cookies
     private
       def set_request_method_cookie
-        cookies[:request_method] = request.request_method
+        if request.get?
+          cookies.delete(:request_method)
+        else
+          cookies[:request_method] = request.request_method
+        end
       end
   end
-end
+end

data/lib/turbolinks/version.rb

@@ -1,3 +1,3 @@
 module Turbolinks
-  VERSION = '2.3.0'
+  VERSION = '2.4.0'
 end

data/lib/turbolinks/xhr_headers.rb

@@ -25,12 +25,12 @@ module Turbolinks
 
     private
       def store_for_turbolinks(url)
-        session[:_turbolinks_redirect_to] = url if request.headers["X-XHR-Referer"]
+        session[:_turbolinks_redirect_to] = url if session && request.headers["X-XHR-Referer"]
         url
       end
 
       def set_xhr_redirected_to
-        if session[:_turbolinks_redirect_to]
+        if session && session[:_turbolinks_redirect_to]
           response.headers['X-XHR-Redirected-To'] = session.delete :_turbolinks_redirect_to
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turbolinks
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails