turbolinks-js 0.5.3 → 0.5.4

data/README.md

@@ -5,6 +5,14 @@ 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,7 @@
 // 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, 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, targetLink, 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; };
 
   initialized = false;
@@ -11,7 +12,7 @@
 
   assets = [];
 
-  pageCache = [];
+  pageCache = {};
 
   createDocument = null;
 
@@ -37,7 +38,7 @@
       var doc;
       doc = createDocument(xhr.responseText);
       if (assetsChanged(doc)) {
-        return document.location.href = url;
+        return document.location.reload();
       } else {
         changePage.apply(null, extractTitleAndBody(doc));
         reflectRedirectedUrl(xhr);
@@ -76,25 +77,51 @@
   };
 
   constrainPageCacheTo = function(limit) {
-    return delete pageCache[currentState.position - limit];
+    var key, value, _results;
+    _results = [];
+    for (key in pageCache) {
+      if (!__hasProp.call(pageCache, key)) continue;
+      value = pageCache[key];
+      if (key <= currentState.position - limit) {
+        _results.push(pageCache[key] = null);
+      } else {
+        _results.push(void 0);
+      }
+    }
+    return _results;
   };
 
-  changePage = function(title, body) {
+  changePage = function(title, body, runScripts) {
     document.title = title;
     document.documentElement.replaceChild(body, document.body);
-    executeScriptTags();
+    if (runScripts) {
+      executeScriptTags();
+    }
     currentState = window.history.state;
     return triggerEvent('page:change');
   };
 
   executeScriptTags = function() {
-    var script, _i, _len, _ref, _ref1, _results;
+    var attr, copy, parent, script, _i, _j, _len, _len1, _ref, _ref1, _ref2, _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));
+        if ((script.src != null) && script.src !== '' && !(script.getAttribute('data-turbolinks-evaluated') != null)) {
+          copy = document.createElement('script');
+          _ref2 = script.attributes;
+          for (_j = 0, _len1 = _ref2.length; _j < _len1; _j++) {
+            attr = _ref2[_j];
+            copy.setAttribute(attr.name, attr.value);
+          }
+          copy.setAttribute('data-turbolinks-evaluated', '');
+          parent = script.parentNode;
+          parent.removeChild(script);
+          _results.push(parent.insertBefore(copy, parent.childNodes[0]));
+        } else {
+          _results.push(window["eval"](script.innerHTML));
+        }
       }
     }
     return _results;
@@ -120,7 +147,7 @@
   rememberCurrentUrl = function() {
     return window.history.replaceState({
       turbolinks: true,
-      position: window.history.length - 1
+      position: Date.now()
     }, '', document.location.href);
   };
 
@@ -170,7 +197,9 @@
   };
 
   assetsChanged = function(doc) {
-    return intersection(extractAssets(doc), assets).length !== assets.length;
+    var extractedAssets;
+    extractedAssets = extractAssets(doc);
+    return extractedAssets.length !== assets.length || intersection(extractedAssets, assets).length !== assets.length;
   };
 
   intersection = function(a, b) {
@@ -191,7 +220,7 @@
   extractTitleAndBody = function(doc) {
     var title;
     title = doc.querySelector('title');
-    return [title != null ? title.textContent : void 0, doc.body];
+    return [title != null ? title.textContent : void 0, doc.body, 'runScripts'];
   };
 
   browserCompatibleDocumentParser = function() {
@@ -204,7 +233,7 @@
       doc = document.implementation.createHTMLDocument('');
       doc.open('replace');
       doc.write(html);
-      doc.close;
+      doc.close();
       return doc;
     };
     if (window.DOMParser) {
@@ -228,7 +257,7 @@
     var link;
     if (!event.defaultPrevented) {
       link = extractLink(event);
-      if (link.nodeName === 'A' && !ignoreClick(event, link)) {
+      if ((link != null ? link.nodeName : void 0) === 'A' && !ignoreClick(event, link)) {
         visit(link.href);
         return event.preventDefault();
       }
@@ -238,16 +267,12 @@
   extractLink = function(event) {
     var link;
     link = event.target;
-    while (!(link === document || link.nodeName === 'A')) {
+    while (!(!link.parentNode || link.nodeName === 'A')) {
       link = link.parentNode;
     }
     return link;
   };
 
-  samePageLink = function(link) {
-    return link.href === document.location.href;
-  };
-
   crossOriginLink = function(link) {
     return location.protocol !== link.protocol || location.host !== link.host;
   };
@@ -269,12 +294,16 @@
     return ignore;
   };
 
+  targetLink = function(link) {
+    return link.target.length !== 0;
+  };
+
   nonStandardClick = function(event) {
     return event.which > 1 || event.metaKey || event.ctrlKey || event.shiftKey || event.altKey;
   };
 
   ignoreClick = function(event, link) {
-    return crossOriginLink(link) || anchoredLink(link) || nonHtmlLink(link) || noTurbolink(link) || nonStandardClick(event);
+    return crossOriginLink(link) || anchoredLink(link) || nonHtmlLink(link) || noTurbolink(link) || targetLink(link) || nonStandardClick(event);
   };
 
   browserSupportsPushState = window.history && window.history.pushState && window.history.replaceState && window.history.state !== void 0;

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-js
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2012-11-29 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -36,20 +36,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Same as Turbolinks but without the CoffeeScript requirement