skrollr-rails 0.6.15 → 0.6.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2506acbc1d652c7ccd09d60e02553493e2871d7d
-  data.tar.gz: 755b5e86c6efbb0b30e6366cd2711ef3de0b2270
+  metadata.gz: 2c81290ed073e2155007ec15149cf1bc759b6d53
+  data.tar.gz: 4ee1a773f944d7b1828037a3c5c80d82610f115a
 SHA512:
-  metadata.gz: 8fa5312f5dbcc521b2c880fdee4fa724227e3033a0d19fa2e6a4e5cada8e3e8137c4e509868ca81bc5fa9f8397ff8a0777203e04c03890e538a5d93563f0ff19
-  data.tar.gz: 036128af38adae715c27478f9dbc63d09402215eff22d393c450c8ce68338c0713aa15d0cc7f082bdf7a988e90b267b3d2ade34097821cb52713f1b176e0d1b3
+  metadata.gz: bbd79792287a6d4c5dbfa56eaa208ee026600ccfb431c76d8498b3f9e891f7400fdfd2acd1923853eaf8b07c823a5f79e0e4b9ebc4965edc34ce6632ee06b26c
+  data.tar.gz: 30b55e4dea3e1e43ab48a3aa3b39f84da1767aeb969f5b9351b9c85479eecd49f2add883130a8ccfb20c88c12c922796eb01f48bea9e8b3f3f8bf38fb5011f28

data/lib/skrollr-rails/version.rb

@@ -1,5 +1,5 @@
 module Skrollr
   module Rails
-    VERSION = "0.6.15"
+    VERSION = "0.6.16"
   end
 end

data/vendor/assets/javascripts/skrollr.js

@@ -1303,8 +1303,14 @@
 		//Make sure z-index gets a <integer>.
 		//This is the only <integer> case we need to handle.
 		if(prop === 'zIndex') {
-			//Floor
-			style[prop] = '' + (val | 0);
+			if(isNaN(val)) {
+				//If it's not a number, don't touch it.
+				//It could for example be "auto" (#351).
+				style[prop] = val;
+			} else {
+				//Floor the number.
+				style[prop] = '' + (val | 0);
+			}
 		}
 		//#64: "float" can't be set across browsers. Needs to use "cssFloat" for all except IE.
 		else if(prop === 'float') {

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

@@ -43,7 +43,7 @@
 	*/
 	var handleClick = function(e) {
 		//Only handle left click.
-		if((e.which || e.button) !== 1) {
+		if(e.which !== 1 && e.button !== 0) {
 			return;
 		}
 
@@ -116,6 +116,16 @@
 		return true;
 	};
 
+	var jumpStraightToHash = function() {
+		if(window.location.hash && document.querySelector) {
+			var link = document.querySelector('a[href="' + window.location.hash + '"]');
+
+			if(link) {
+				handleLink(link, true);
+			}
+		}
+	};
+
 	var defer = function(fn) {
 		window.setTimeout(fn, 1);
 	};
@@ -145,7 +155,7 @@
 		skrollr.addEvent(document, 'click', handleClick);
 
 		if(supportsHistory) {
-			window.addEventListener('popstate', function(e) {
+			skrollr.addEvent(window, 'popstate', function(e) {
 				var state = e.state || {};
 				var top = state.top || 0;
 
@@ -154,6 +164,8 @@
 				});
 			}, false);
 		}
+
+		jumpStraightToHash();
 	};
 
 	//Private reference to the initialized skrollr.
@@ -168,14 +180,6 @@
 	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);
-				}
-			}
 		}
 	});
 }(document, window));

metadata

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