skrollr-rails 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 638e39f1ee200fe4cb80c1fee9cb42b9a96acf34
-  data.tar.gz: 645e9dee97c2c3cc5aabe6852f1cfa13cbdadd41
+  metadata.gz: d5626de761b7901972f19f4277355e76216f0618
+  data.tar.gz: 8c4c9c685a9401950575be87ad5fb6c42fb64790
 SHA512:
-  metadata.gz: 47e93132b9598841503046b1ac48f64836eb138e99bd66761e1dae0289245609f36eac2ccf1b2e959fb512aaec8045ead94c8db9fb7587fb7665befa6470dd05
-  data.tar.gz: 5b876404c7a083f84c82acab5a0f25edb0ce03aae20929ef7b906f342f86e729a71207e8b3dfd93ad39403ad543a909c7faf36f8b2bbd342a35de252131fdc50
+  metadata.gz: 76583ccee883c1694638fffa79ae619be25200559ece7d1fbe4807fb4764509e12bbf665edd8ca84bbcbf56645cd5025cda8a8b6f4743092f0c3568a88bc109d
+  data.tar.gz: d76f4d63911bb8d79cee67f12ab11aab2292ec14fcab0ded1105a961fe9e237bf57d45a708f23546863730a2b1af26d28405b9bf136316a9b56f929f5b20a721

data/lib/skrollr-rails/version.rb

@@ -1,5 +1,5 @@
 module Skrollr
   module Rails
-    VERSION = "0.6.8"
+    VERSION = "0.6.9"
   end
 end

data/vendor/assets/javascripts/skrollr.js

@@ -19,7 +19,7 @@
 		init: function(options) {
 			return _instance || new Skrollr(options);
 		},
-		VERSION: '0.6.8'
+		VERSION: '0.6.9'
 	};
 
 	//Minify optimization.
@@ -147,7 +147,7 @@
 			requestAnimFrame = function(callback) {
 				//How long did it take to render?
 				var deltaTime = _now() - lastTime;
-				var delay = Math.max(0, 33 - deltaTime);
+				var delay = Math.max(0, 1000 / 60 - deltaTime);
 
 				window.setTimeout(function() {
 					lastTime = _now();
@@ -555,12 +555,6 @@
 
 		if(_isMobile) {
 			_mobileOffset = Math.min(Math.max(top, 0), _maxKeyFrame);
-
-			//That's were we actually "scroll" on mobile.
-			if(_skrollrBody) {
-				//Set the transform ("scroll it").
-				skrollr.setStyle(_skrollrBody, 'transform', 'translate(0, ' + -(_mobileOffset) + 'px) ' + _translateZ);
-			}
 		} else {
 			window.scrollTo(0, top);
 		}
@@ -622,6 +616,8 @@
 						initialElement.blur();
 					}
 
+					_instance.stopAnimateTo();
+
 					initialElement = e.target;
 					initialTouchY = lastTouchY = currentTouchY;
 					initialTouchX = currentTouchX;
@@ -632,7 +628,7 @@
 					deltaY = currentTouchY - lastTouchY;
 					deltaTime = currentTouchTime - lastTouchTime;
 
-					_instance.setScrollTop(_mobileOffset - deltaY);
+					_instance.setScrollTop(_mobileOffset - deltaY, true);
 
 					lastTouchY = currentTouchY;
 					lastTouchTime = currentTouchTime;
@@ -889,7 +885,7 @@
 				renderTop = (_scrollAnimation.startTop + progress * _scrollAnimation.topDiff) | 0;
 			}
 
-			_instance.setScrollTop(renderTop);
+			_instance.setScrollTop(renderTop, true);
 		}
 		//Smooth scrolling only if there's no animation running and if we're not on mobile.
 		else if(!_isMobile) {
@@ -915,6 +911,12 @@
 			}
 		}
 
+		//That's were we actually "scroll" on mobile.
+		if(_isMobile && _skrollrBody) {
+			//Set the transform ("scroll it").
+			skrollr.setStyle(_skrollrBody, 'transform', 'translate(0, ' + -(_mobileOffset) + 'px) ' + _translateZ);
+		}
+
 		//Did the scroll position even change?
 		if(_forceRender || _lastTop !== renderTop) {
 			//Remember in which direction are we scrolling?

data/vendor/assets/javascripts/skrollr.menu.js

@@ -16,6 +16,8 @@
 	var MENU_OFFSET_ATTR = 'data-menu-offset';
 
 	var skrollr = window.skrollr;
+	var history = window.history;
+	var supportsHistory = !!history.pushState;
 
 	/*
 		Since we are using event bubbling, the element that has been clicked
@@ -52,12 +54,22 @@
 			return;
 		}
 
+		if(handleLink(link)) {
+			e.preventDefault();
+		}
+	};
+
+	/*
+		Handles the click on a link. May be called without an actual click event.
+		When the fake flag is set, the link won't change the url and the position won't be animated.
+	*/
+	var handleLink = function(link, fake) {
 		//Don't use the href property (link.href) because it contains the absolute url.
 		var href = link.getAttribute('href');
 
 		//Check if it's a hashlink.
 		if(!/^#/.test(href)) {
-			return;
+			return false;
 		}
 
 		//Now get the targetTop to scroll to.
@@ -73,7 +85,7 @@
 
 			//Ignore the click if no target is found.
 			if(!scrollTarget) {
-				return;
+				return false;
 			}
 
 			targetTop = _skrollrInstance.relativeToAbsolute(scrollTarget, 'top', 'top');
@@ -85,17 +97,27 @@
 			}
 		}
 
+		if(supportsHistory && !fake) {
+			history.pushState({top: targetTop}, '', href);
+		}
+
 		//Now finally scroll there.
-		if(_animate) {
+		if(_animate && !fake) {
 			_skrollrInstance.animateTo(targetTop, {
 				duration: _duration,
 				easing: _easing
 			});
 		} else {
-			_skrollrInstance.setScrollTop(targetTop);
+			defer(function() {
+				_skrollrInstance.setScrollTop(targetTop);
+			});
 		}
 
-		e.preventDefault();
+		return true;
+	};
+
+	var defer = function(fn) {
+		window.setTimeout(fn, 1);
 	};
 
 	/*
@@ -113,6 +135,17 @@
 
 		//Use event bubbling and attach a single listener to the document.
 		skrollr.addEvent(document, 'click', handleClick);
+
+		if(supportsHistory) {
+			window.addEventListener('popstate', function(e) {
+				var state = e.state || {};
+				var top = state.top || 0;
+
+				defer(function() {
+					_skrollrInstance.setScrollTop(top);
+				});
+			}, false);
+		}
 	};
 
 	//Private reference to the initialized skrollr.
@@ -124,9 +157,17 @@
 
 	//In case the page was opened with a hash, prevent jumping to it.
 	//http://stackoverflow.com/questions/3659072/jquery-disable-anchor-jump-when-loading-a-page
-	window.setTimeout(function() {
+	defer(function() {
 		if(window.location.hash) {
 			window.scrollTo(0, 0);
+
+			if(document.querySelector) {
+				var link = document.querySelector('a[href="' + window.location.hash + '"]');
+
+				if(link) {
+					handleLink(link, true);
+				}
+			}
 		}
-	}, 1);
+	});
 }(document, window));

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skrollr-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - Nick Reed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails