turbolinks-js 0.2.1 → 0.3.0

data/lib/assets/javascripts/turbolinks.js

@@ -1,6 +1,6 @@
 // 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, samePageLink, triggerEvent, visit;
+  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;
 
   pageCache = [];
 
@@ -20,11 +20,13 @@
 
   fetchReplacement = function(url) {
     var xhr;
+    triggerEvent('page:fetch');
     xhr = new XMLHttpRequest;
     xhr.open('GET', url, true);
     xhr.setRequestHeader('Accept', 'text/html, application/xhtml+xml, application/xml');
     xhr.onload = function() {
-      return changePage.apply(null, extractTitleAndBody(xhr.responseText));
+      changePage.apply(null, extractTitleAndBody(xhr.responseText));
+      return triggerEvent('page:load');
     };
     xhr.onabort = function() {
       return console.log('Aborted turbolink fetch!');
@@ -37,7 +39,8 @@
     cacheCurrentPage();
     if (page = pageCache[state.position]) {
       changePage(page.title, page.body.cloneNode(true));
-      return recallScrollPosition(page);
+      recallScrollPosition(page);
+      return triggerEvent('page:restore');
     } else {
       return fetchReplacement(document.location.href);
     }
@@ -69,10 +72,12 @@
   };
 
   reflectNewUrl = function(url) {
-    return window.history.pushState({
-      turbolinks: true,
-      position: window.history.length
-    }, '', url);
+    if (url !== document.location.href) {
+      return window.history.pushState({
+        turbolinks: true,
+        position: currentState.position + 1
+      }, '', url);
+    }
   };
 
   rememberCurrentUrl = function() {
@@ -95,7 +100,7 @@
   };
 
   recallScrollPosition = function(page) {
-    return window.scrollTo(page.positionX, page.positionX);
+    return window.scrollTo(page.positionX, page.positionY);
   };
 
   triggerEvent = function(name) {
@@ -135,6 +140,15 @@
     }
   })();
 
+  handleClick = function(event) {
+    var link;
+    link = extractLink(event);
+    if (link.nodeName === 'A' && !ignoreClick(event, link)) {
+      visit(link.href);
+      return event.preventDefault();
+    }
+  };
+
   extractLink = function(event) {
     var link;
     link = event.target;
@@ -160,6 +174,10 @@
     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;
   };
@@ -169,16 +187,7 @@
   };
 
   ignoreClick = function(event, link) {
-    return samePageLink(link) || crossOriginLink(link) || anchoredLink(link) || nonHtmlLink(link) || noTurbolink(link) || newTabClick(event);
-  };
-
-  handleClick = function(event) {
-    var link;
-    link = extractLink(event);
-    if (link.nodeName === 'A' && !ignoreClick(event, link)) {
-      visit(link.href);
-      return event.preventDefault();
-    }
+    return samePageLink(link) || crossOriginLink(link) || anchoredLink(link) || nonHtmlLink(link) || remoteLink(link) || noTurbolink(link) || newTabClick(event);
   };
 
   browserSupportsPushState = window.history && window.history.pushState && window.history.replaceState;

data/test/config.ru

@@ -10,4 +10,4 @@ map "/js" do
   run Assets
 end
 
-run Rack::Directory.new(Root)
+run Rack::Directory.new(File.join(Root, "test"))

data/test/index.html

@@ -12,10 +12,10 @@
 </head>
 <body class="page-index">
   <ul style="margin-top:200px;">
-    <li><a href="/test/other.html">Other page</a></li>
-    <li><a href="/test/other.html"><span>Wrapped link</span></a></li>
+    <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="/test/dummy.gif?12345">Query Param Image Link</a></li>
+    <li><a href="/dummy.gif?12345">Query Param Image Link</a></li>
     <li><a href="#">Hash link</a></li>
   </ul>
 

data/test/other.html

@@ -12,7 +12,7 @@
 </head>
 <body class="page-other">
   <ul>
-    <li><a href="/test/index.html">Home</a></li>
+    <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.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-27 00:00:00.000000000 Z
+date: 2012-09-28 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: