turbolinks-js 0.5.4 → 0.6.0

data/README.md

@@ -5,14 +5,6 @@ Same as Turbolinks but without the CoffeeScript requirement.
 Check [Turbolinks](https://github.com/rails/turbolinks) for
 more information.
 
-Compatibility
--------------
-
-Turbolinks is designed to work with any browser that fully supports pushState and all the related APIs. This includes Safari 6.0+ (but not Safari 5.1.x!), IE10, and latest Chromes and Firefoxes.
-
-Do note that existing JavaScript libraries may not all be compatible with Turbolinks out of the box due to the change in instantiation cycle. You might very well have to modify them to work with Turbolinks' new set of events.
-
-
 Installation
 ------------
 

data/lib/assets/javascripts/turbolinks.js

@@ -1,6 +1,6 @@
 // Generated by CoffeeScript 1.3.3
 (function() {
-  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, targetLink, triggerEvent, visit,
+  var anchoredLink, assetsChanged, browserCompatibleDocumentParser, browserSupportsPushState, cacheCurrentPage, changePage, constrainPageCacheTo, createDocument, crossOriginLink, currentState, executeScriptTags, extractLink, extractTitleAndBody, extractTrackAssets, fetchHistory, fetchReplacement, handleClick, ignoreClick, initialized, installClickHandlerLast, intersection, noTurbolink, nonHtmlLink, nonStandardClick, pageCache, recallScrollPosition, referer, reflectNewUrl, reflectRedirectedUrl, rememberCurrentState, rememberCurrentTrackingAssets, rememberCurrentUrl, rememberInitialPage, resetScrollPosition, targetLink, trackingAssets, triggerEvent, visit,
     __hasProp = {}.hasOwnProperty,
     __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; };
 
@@ -10,7 +10,7 @@
 
   referer = document.location.href;
 
-  assets = [];
+  trackingAssets = [];
 
   pageCache = {};
 
@@ -139,8 +139,8 @@
 
   reflectRedirectedUrl = function(xhr) {
     var location;
-    if ((location = xhr.getResponseHeader('X-XHR-Current-Location'))) {
-      return window.history.replaceState(currentState, '', location);
+    if ((location = xhr.getResponseHeader('X-XHR-Current-Location')) !== document.location.pathname + document.location.search) {
+      return window.history.replaceState(currentState, '', location + document.location.hash);
     }
   };
 
@@ -155,8 +155,8 @@
     return currentState = window.history.state;
   };
 
-  rememberCurrentAssets = function() {
-    return assets = extractAssets(document);
+  rememberCurrentTrackingAssets = function() {
+    return trackingAssets = extractTrackAssets(document);
   };
 
   rememberInitialPage = function() {
@@ -183,13 +183,13 @@
     return document.dispatchEvent(event);
   };
 
-  extractAssets = function(doc) {
+  extractTrackAssets = 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) {
+      if ((typeof node.getAttribute === "function" ? node.getAttribute('data-turbolinks-track') : void 0) != null) {
         _results.push(node.src || node.href);
       }
     }
@@ -197,9 +197,9 @@
   };
 
   assetsChanged = function(doc) {
-    var extractedAssets;
-    extractedAssets = extractAssets(doc);
-    return extractedAssets.length !== assets.length || intersection(extractedAssets, assets).length !== assets.length;
+    var extractedTrackAssets;
+    extractedTrackAssets = extractTrackAssets(doc);
+    return extractedTrackAssets.length !== trackingAssets.length || intersection(extractedTrackAssets, trackingAssets).length !== trackingAssets.length;
   };
 
   intersection = function(a, b) {
@@ -309,7 +309,7 @@
   browserSupportsPushState = window.history && window.history.pushState && window.history.replaceState && window.history.state !== void 0;
 
   if (browserSupportsPushState) {
-    rememberCurrentAssets();
+    rememberCurrentTrackingAssets();
     document.addEventListener('click', installClickHandlerLast, true);
     window.addEventListener('popstate', function(event) {
       var _ref;

data/test/index.html

@@ -16,10 +16,10 @@
     <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="/reload.html"><span>New assets track </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>
+    <li><a href="/reload.html#foo">New assets track with hash link</a></li>
   </ul>
 
   <div style="background:#ccc;height:5000px;width:200px;">

data/test/reload.html

@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
   <title>Home</title>
-  <script type="text/javascript" src="/js/turbolinks.js?1"></script>
+  <script type="text/javascript" src="/js/turbolinks.js?1" data-turbolinks-track='true'></script>
   <script type="text/javascript">
     document.addEventListener("page:change", function() {
       console.log("page changed");

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turbolinks-js
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-29 00:00:00.000000000 Z
+date: 2012-12-04 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: