turbolinks-js 0.6.0 → 0.6.1

data/lib/assets/javascripts/turbolinks.js

@@ -1,6 +1,6 @@
 // Generated by CoffeeScript 1.3.3
 (function() {
-  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,
+  var anchoredLink, assetsChanged, browserCompatibleDocumentParser, browserSupportsPushState, cacheCurrentPage, changePage, constrainPageCacheTo, createDocument, crossOriginLink, currentState, executeScriptTags, extractLink, extractTitleAndBody, extractTrackAssets, fetchHistory, fetchReplacement, handleClick, ignoreClick, initialized, installClickHandlerLast, intersection, loadedAssets, noTurbolink, nonHtmlLink, nonStandardClick, pageCache, recallScrollPosition, referer, reflectNewUrl, reflectRedirectedUrl, 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; };
 
@@ -10,7 +10,7 @@
 
   referer = document.location.href;
 
-  trackingAssets = [];
+  loadedAssets = null;
 
   pageCache = {};
 
@@ -102,27 +102,24 @@
   };
 
   executeScriptTags = function() {
-    var attr, copy, parent, script, _i, _j, _len, _len1, _ref, _ref1, _ref2, _results;
+    var attr, copy, nextSibling, parentNode, 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') {
-        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));
-        }
+      if (!((_ref1 = script.type) === '' || _ref1 === 'text/javascript')) {
+        continue;
       }
+      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.appendChild(document.createTextNode(script.innerHTML));
+      parentNode = script.parentNode, nextSibling = script.nextSibling;
+      parentNode.removeChild(script);
+      _results.push(parentNode.insertBefore(copy, nextSibling));
     }
     return _results;
   };
@@ -155,10 +152,6 @@
     return currentState = window.history.state;
   };
 
-  rememberCurrentTrackingAssets = function() {
-    return trackingAssets = extractTrackAssets(document);
-  };
-
   rememberInitialPage = function() {
     if (!initialized) {
       rememberCurrentUrl();
@@ -197,9 +190,10 @@
   };
 
   assetsChanged = function(doc) {
-    var extractedTrackAssets;
-    extractedTrackAssets = extractTrackAssets(doc);
-    return extractedTrackAssets.length !== trackingAssets.length || intersection(extractedTrackAssets, trackingAssets).length !== trackingAssets.length;
+    var fetchedAssets;
+    loadedAssets || (loadedAssets = extractTrackAssets(document));
+    fetchedAssets = extractTrackAssets(doc);
+    return fetchedAssets.length !== loadedAssets.length || intersection(fetchedAssets, loadedAssets).length !== loadedAssets.length;
   };
 
   intersection = function(a, b) {
@@ -309,7 +303,6 @@
   browserSupportsPushState = window.history && window.history.pushState && window.history.replaceState && window.history.state !== void 0;
 
   if (browserSupportsPushState) {
-    rememberCurrentTrackingAssets();
     document.addEventListener('click', installClickHandlerLast, true);
     window.addEventListener('popstate', function(event) {
       var _ref;

metadata

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