skrollr-rails 0.6.27 → 0.6.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ece143bcbb7e53716091bb2c3aa5e4106c862faa
-  data.tar.gz: c9304911e110bb764a56ea44fd6114cf95afe937
+  metadata.gz: aa9d428c9c602aa99a62d2a221fa9264bc99b884
+  data.tar.gz: fe2a766c787113a571fed7d4d0815f20205a47d9
 SHA512:
-  metadata.gz: 316f64c652cdb2174257732d64c68bde2a04a2a672e2339745fbff32396f97178bd5077bd4984581509e91b5bb3354fd326c56a04e076208589c1ffea88a62a5
-  data.tar.gz: 823ab0805ecca0ab882c16fb3aa3ef7ca06837bb3211c4c0ea0df250b7bb84f650b1a81ddfe98b1d5beba15751115faefdcdce542cb5bf8e417e50de587de7ce
+  metadata.gz: 495245976b9495a0b327e70fc17d589ded15b13e8d965fb2a3d69697d81e0ac47ba8d1852e1ee16dcc57a81d482c9a77a638e70b5f426f00c3ba6a7ffbff1f42
+  data.tar.gz: 30bd98fe054124cc40fe5e131f87d185b4b63f1a298f9b1cfd4ab26e9dc48630c2c68c3d733e6216cdd004954c01d3b2d16fb5ea185df409e90a020cc9cf4332

data/lib/skrollr-rails/version.rb

@@ -1,5 +1,5 @@
 module Skrollr
   module Rails
-    VERSION = "0.6.27"
+    VERSION = "0.6.28"
   end
 end

data/vendor/assets/javascripts/skrollr.js

@@ -19,7 +19,7 @@
 		init: function(options) {
 			return _instance || new Skrollr(options);
 		},
-		VERSION: '0.6.27'
+		VERSION: '0.6.28'
 	};
 
 	//Minify optimization.
@@ -1566,8 +1566,14 @@
 	 * Returns the height of the document.
 	 */
 	var _getDocumentHeight = function() {
-		var skrollrBodyHeight = (_skrollrBody && _skrollrBody.offsetHeight || 0);
-		var bodyHeight = Math.max(skrollrBodyHeight, body.scrollHeight, body.offsetHeight, documentElement.scrollHeight, documentElement.offsetHeight, documentElement.clientHeight);
+		var skrollrBodyHeight = 0;
+		var bodyHeight;
+
+		if(_skrollrBody) {
+			skrollrBodyHeight = Math.max(_skrollrBody.offsetHeight, _skrollrBody.scrollHeight);
+		}
+
+		bodyHeight = Math.max(skrollrBodyHeight, body.scrollHeight, body.offsetHeight, documentElement.scrollHeight, documentElement.offsetHeight, documentElement.clientHeight);
 
 		return bodyHeight - documentElement.clientHeight;
 	};

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

@@ -15,6 +15,7 @@
 
 	var MENU_TOP_ATTR = 'data-menu-top';
 	var MENU_OFFSET_ATTR = 'data-menu-offset';
+	var MENU_DURATION_ATTR = 'data-menu-duration';
 
 	var skrollr = window.skrollr;
 	var history = window.history;
@@ -65,11 +66,28 @@
 		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');
+		var hash;
 
-		//Check if it's a hashlink.
-		if(!/^#/.test(href)) {
+		//When complexLinks is enabled, we also accept links which do not just contain a simple hash.
+		if(_complexLinks) {
+			//The link points to something completely different.
+			if(link.hostname !== window.location.hostname) {
+				return false;
+			}
+
+			//The link does not link to the same page/path.
+			if(link.pathname !== document.location.pathname) {
+				return false;
+			}
+
+			hash = link.hash;
+		} else {
+			//Don't use the href property (link.href) because it contains the absolute url.
+			hash = link.getAttribute('href');
+		}
+
+		//Not a hash link.
+		if(!/^#/.test(hash)) {
 			return false;
 		}
 
@@ -95,7 +113,7 @@
 				targetTop = +menuTop * _scale;
 			}
 		} else {
-			var scrollTarget = document.getElementById(href.substr(1));
+			var scrollTarget = document.getElementById(hash.substr(1));
 
 			//Ignore the click if no target is found.
 			if(!scrollTarget) {
@@ -112,13 +130,20 @@
 		}
 
 		if(supportsHistory && !fake) {
-			history.pushState({top: targetTop}, '', href);
+			history.pushState({top: targetTop}, '', hash);
+		}
+
+		var menuDuration = parseInt(link.getAttribute(MENU_DURATION_ATTR), 10);
+		var animationDuration = _duration(_skrollrInstance.getScrollTop(), targetTop);
+
+		if(!isNaN(menuDuration)) {
+			animationDuration = menuDuration;
 		}
 
 		//Now finally scroll there.
 		if(_animate && !fake) {
 			_skrollrInstance.animateTo(targetTop, {
-				duration: _duration(_skrollrInstance.getScrollTop(), targetTop),
+				duration: animationDuration,
 				easing: _easing
 			});
 		} else {
@@ -162,6 +187,7 @@
 		_duration = options.duration || DEFAULT_DURATION;
 		_handleLink = options.handleLink;
 		_scale = options.scale || DEFAULT_SCALE;
+		_complexLinks = options.complexLinks === true;
 
 		if(typeof _duration === 'number') {
 			_duration = (function(duration) {
@@ -202,6 +228,7 @@
 	var _animate;
 	var _handleLink;
 	var _scale;
+	var _complexLinks;
 
 	//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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skrollr-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.27
+  version: 0.6.28
 platform: ruby
 authors:
 - Nick Reed