turbolinks-js 0.3.0 → 0.4.0

data/lib/assets/javascripts/turbolinks.js

@@ -1,12 +1,19 @@
 // Generated by CoffeeScript 1.3.3
 (function() {
-  var anchoredLink, browserSupportsPushState, cacheCurrentPage, changePage, constrainPageCacheTo, createDocument, crossOriginLink, currentState, extractLink, extractTitleAndBody, fetchHistory, fetchReplacement, handleClick, ignoreClick, initialized, newTabClick, noTurbolink, nonHtmlLink, pageCache, recallScrollPosition, reflectNewUrl, rememberCurrentState, rememberCurrentUrl, rememberInitialPage, remoteLink, samePageLink, triggerEvent, visit;
+  var anchoredLink, assets, assetsChanged, browserCompatibleDocumentParser, browserSupportsPushState, cacheCurrentPage, changePage, constrainPageCacheTo, createDocument, crossOriginLink, currentState, executeScriptTags, extractAssets, extractLink, extractTitleAndBody, fetchHistory, fetchReplacement, handleClick, ignoreClick, initialized, installClickHandlerLast, intersection, noTurbolink, nonHtmlLink, nonStandardClick, pageCache, recallScrollPosition, referer, reflectNewUrl, reflectRedirectedUrl, rememberCurrentAssets, rememberCurrentState, rememberCurrentUrl, rememberInitialPage, resetScrollPosition, samePageLink, triggerEvent, visit,
+    __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
 
-  pageCache = [];
+  initialized = false;
 
   currentState = null;
 
-  initialized = false;
+  referer = document.location.href;
+
+  assets = [];
+
+  pageCache = [];
+
+  createDocument = null;
 
   visit = function(url) {
     if (browserSupportsPushState) {
@@ -19,14 +26,24 @@
   };
 
   fetchReplacement = function(url) {
-    var xhr;
+    var xhr,
+      _this = this;
     triggerEvent('page:fetch');
     xhr = new XMLHttpRequest;
     xhr.open('GET', url, true);
     xhr.setRequestHeader('Accept', 'text/html, application/xhtml+xml, application/xml');
+    xhr.setRequestHeader('X-XHR-Referer', referer);
     xhr.onload = function() {
-      changePage.apply(null, extractTitleAndBody(xhr.responseText));
-      return triggerEvent('page:load');
+      var doc;
+      doc = createDocument(xhr.responseText);
+      if (assetsChanged(doc)) {
+        return document.location.href = url;
+      } else {
+        changePage.apply(null, extractTitleAndBody(doc));
+        reflectRedirectedUrl(xhr);
+        resetScrollPosition();
+        return triggerEvent('page:load');
+      }
     };
     xhr.onabort = function() {
       return console.log('Aborted turbolink fetch!');
@@ -38,7 +55,7 @@
     var page;
     cacheCurrentPage();
     if (page = pageCache[state.position]) {
-      changePage(page.title, page.body.cloneNode(true));
+      changePage(page.title, page.body);
       recallScrollPosition(page);
       return triggerEvent('page:restore');
     } else {
@@ -59,20 +76,33 @@
   };
 
   constrainPageCacheTo = function(limit) {
-    if (currentState.position === window.history.length - 1) {
-      return delete pageCache[currentState.position - limit];
-    }
+    return delete pageCache[currentState.position - limit];
   };
 
   changePage = function(title, body) {
     document.title = title;
     document.documentElement.replaceChild(body, document.body);
+    executeScriptTags();
     currentState = window.history.state;
     return triggerEvent('page:change');
   };
 
+  executeScriptTags = function() {
+    var script, _i, _len, _ref, _ref1, _results;
+    _ref = document.body.getElementsByTagName('script');
+    _results = [];
+    for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+      script = _ref[_i];
+      if ((_ref1 = script.type) === '' || _ref1 === 'text/javascript') {
+        _results.push(eval(script.innerHTML));
+      }
+    }
+    return _results;
+  };
+
   reflectNewUrl = function(url) {
     if (url !== document.location.href) {
+      referer = document.location.href;
       return window.history.pushState({
         turbolinks: true,
         position: currentState.position + 1
@@ -80,6 +110,13 @@
     }
   };
 
+  reflectRedirectedUrl = function(xhr) {
+    var location;
+    if ((location = xhr.getResponseHeader('X-XHR-Current-Location'))) {
+      return window.history.replaceState(currentState, '', location);
+    }
+  };
+
   rememberCurrentUrl = function() {
     return window.history.replaceState({
       turbolinks: true,
@@ -91,10 +128,16 @@
     return currentState = window.history.state;
   };
 
+  rememberCurrentAssets = function() {
+    return assets = extractAssets(document);
+  };
+
   rememberInitialPage = function() {
     if (!initialized) {
       rememberCurrentUrl();
       rememberCurrentState();
+      rememberCurrentAssets();
+      createDocument = browserCompatibleDocumentParser();
       return initialized = true;
     }
   };
@@ -103,6 +146,10 @@
     return window.scrollTo(page.positionX, page.positionY);
   };
 
+  resetScrollPosition = function() {
+    return window.scrollTo(0, 0);
+  };
+
   triggerEvent = function(name) {
     var event;
     event = document.createEvent('Events');
@@ -110,14 +157,45 @@
     return document.dispatchEvent(event);
   };
 
-  extractTitleAndBody = function(html) {
-    var doc, title;
-    doc = createDocument(html);
+  extractAssets = function(doc) {
+    var node, _i, _len, _ref, _results;
+    _ref = doc.head.childNodes;
+    _results = [];
+    for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+      node = _ref[_i];
+      if (node.src || node.href) {
+        _results.push(node.src || node.href);
+      }
+    }
+    return _results;
+  };
+
+  assetsChanged = function(doc) {
+    return intersection(extractAssets(doc), assets).length !== assets.length;
+  };
+
+  intersection = function(a, b) {
+    var value, _i, _len, _ref, _results;
+    if (a.length > b.length) {
+      _ref = [b, a], a = _ref[0], b = _ref[1];
+    }
+    _results = [];
+    for (_i = 0, _len = a.length; _i < _len; _i++) {
+      value = a[_i];
+      if (__indexOf.call(b, value) >= 0) {
+        _results.push(value);
+      }
+    }
+    return _results;
+  };
+
+  extractTitleAndBody = function(doc) {
+    var title;
     title = doc.querySelector('title');
     return [title != null ? title.textContent : void 0, doc.body];
   };
 
-  createDocument = (function() {
+  browserCompatibleDocumentParser = function() {
     var createDocumentUsingParser, createDocumentUsingWrite, testDoc, _ref;
     createDocumentUsingParser = function(html) {
       return (new DOMParser).parseFromString(html, 'text/html');
@@ -138,14 +216,23 @@
     } else {
       return createDocumentUsingWrite;
     }
-  })();
+  };
+
+  installClickHandlerLast = function(event) {
+    if (!event.defaultPrevented) {
+      document.removeEventListener('click', handleClick);
+      return document.addEventListener('click', handleClick);
+    }
+  };
 
   handleClick = function(event) {
     var link;
-    link = extractLink(event);
-    if (link.nodeName === 'A' && !ignoreClick(event, link)) {
-      visit(link.href);
-      return event.preventDefault();
+    if (!event.defaultPrevented) {
+      link = extractLink(event);
+      if (link.nodeName === 'A' && !ignoreClick(event, link)) {
+        visit(link.href);
+        return event.preventDefault();
+      }
     }
   };
 
@@ -174,34 +261,33 @@
     return link.href.match(/\.[a-z]+(\?.*)?$/g) && !link.href.match(/\.html?(\?.*)?$/g);
   };
 
-  remoteLink = function(link) {
-    return link.getAttribute('data-remote') != null;
-  };
-
   noTurbolink = function(link) {
-    return link.getAttribute('data-no-turbolink') != null;
+    var ignore;
+    while (!(ignore || link === document)) {
+      ignore = link.getAttribute('data-no-turbolink') != null;
+      link = link.parentNode;
+    }
+    return ignore;
   };
 
-  newTabClick = function(event) {
-    return event.which > 1 || event.metaKey || event.ctrlKey;
+  nonStandardClick = function(event) {
+    return event.which > 1 || event.metaKey || event.ctrlKey || event.shiftKey || event.altKey;
   };
 
   ignoreClick = function(event, link) {
-    return samePageLink(link) || crossOriginLink(link) || anchoredLink(link) || nonHtmlLink(link) || remoteLink(link) || noTurbolink(link) || newTabClick(event);
+    return crossOriginLink(link) || anchoredLink(link) || nonHtmlLink(link) || noTurbolink(link) || nonStandardClick(event);
   };
 
-  browserSupportsPushState = window.history && window.history.pushState && window.history.replaceState;
+  browserSupportsPushState = window.history && window.history.pushState && window.history.replaceState && window.history.state !== void 0;
 
   if (browserSupportsPushState) {
+    document.addEventListener('click', installClickHandlerLast, true);
     window.addEventListener('popstate', function(event) {
       var _ref;
       if ((_ref = event.state) != null ? _ref.turbolinks : void 0) {
         return fetchHistory(event.state);
       }
     });
-    document.addEventListener('click', function(event) {
-      return handleClick(event);
-    });
   }
 
   this.Turbolinks = {

data/lib/turbolinks.rb

@@ -1,4 +1,31 @@
 module Turbolinks
+  module XHRHeaders
+    extend ActiveSupport::Concern
+
+    included do
+      alias_method_chain :_compute_redirect_to_location, :xhr_referer
+    end
+
+    private
+      def _compute_redirect_to_location_with_xhr_referer(options)
+        if options == :back && request.headers["X-XHR-Referer"]
+          _compute_redirect_to_location_without_xhr_referer(request.headers["X-XHR-Referer"])
+        else
+          _compute_redirect_to_location_without_xhr_referer(options)
+        end
+      end
+
+      def set_xhr_current_location
+        response.headers['X-XHR-Current-Location'] = request.fullpath
+      end
+  end
+
   class Engine < ::Rails::Engine
+    initializer :turbolinks_xhr_headers do |config|
+      ActionController::Base.class_eval do
+        include XHRHeaders
+        after_filter :set_xhr_current_location
+      end
+    end
   end
-end
+end

data/test/index.html

@@ -15,6 +15,8 @@
     <li><a href="/other.html">Other page</a></li>
     <li><a href="/other.html"><span>Wrapped link</span></a></li>
     <li><a href="http://www.google.com/">Cross origin</a></li>
+    <li><a href="/other.html" onclick="if(!confirm('follow link?')) { return false}">Confirm Fire Order</a></li>
+    <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>
   </ul>

data/test/reload.html

@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>Home</title>
+  <script type="text/javascript" src="/js/turbolinks.js?1"></script>
+  <script type="text/javascript">
+    document.addEventListener("page:change", function() {
+      console.log("page changed");
+    });
+  </script>
+</head>
+<body class="page-reload">
+  <ul>
+    <li><a href="/index.html">Home</a></li>
+  </ul>
+</body>
+</html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turbolinks-js
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-28 00:00:00.000000000 Z
+date: 2012-10-03 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -27,7 +27,8 @@ files:
 - test/dummy.gif
 - test/index.html
 - test/other.html
-homepage: 
+- test/reload.html
+homepage: https://github.com/epiclabs/turbolinks-js/
 licenses: []
 post_install_message: 
 rdoc_options: []