skrollr-rails 0.6.17 → 0.6.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f2a4e524513a3fcc1bce8801cd4e0c4988582d1
-  data.tar.gz: 929ee48321fdc2726e0592fbf883123ebe30370f
+  metadata.gz: 0b0711aeba31d3dfacb79fbe8b261990286913e5
+  data.tar.gz: 1e037a545ae4cbe7fad4a922f86c9ddf48af51f7
 SHA512:
-  metadata.gz: afdc7eff57a77a7cff835b81efd9394c7e28a01cf904c16683a52407ed5e2b9fa65f0db78b41cb95bef7e9545e1682afdc1751a73508126d9bf5e08db3c2fdb9
-  data.tar.gz: c6d2fca63f09370db4b16b36790ac0d564325c6543ff8ecaf21a04d66a5a7a17522780548199d3c768c04495c69aa080b2d41a3893ac3a73e5dc9f67075d4e0a
+  metadata.gz: b3846cc5e3288a4ef106d71a3eb3d23ca51565e91af38d7b7f94d130045249fea37af10d00e797da563aeb87955630946797693cd5c659bb27c221694db3aa96
+  data.tar.gz: e4ab8a4af0572e44dc4d03ddf16e9040c851726462d40b23d8aa4e6fb031c4b024f0cfdc71fbc6e43bb66f4b9bbec5f06f6ea7b0dfe0c194693b92bc6ff1ac3e

data/lib/skrollr-rails/version.rb

@@ -1,5 +1,5 @@
 module Skrollr
   module Rails
-    VERSION = "0.6.17"
+    VERSION = "0.6.18"
   end
 end

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

@@ -27,8 +27,8 @@
 		if(prop === 'opacity') {
 			style.zoom = 1;
 
-			//Remove filter attribute in IE
-			if(val >= 1 && style.removeAttribute) {
+			//Remove filter attribute in IE.
+			if(val === 1 && style.removeAttribute) {
 				style.removeAttribute('filter');
 			} else {
 				style.filter = 'alpha(opacity=' + val * 100 + ')';

data/vendor/assets/javascripts/skrollr.js

@@ -718,6 +718,11 @@
 
 					break;
 				case EVENT_TOUCHMOVE:
+					//Prevent default event on touchIgnore elements in case they don't have focus yet.
+					if(rxTouchIgnoreTags.test(currentElement.tagName) && document.activeElement !== currentElement) {
+						e.preventDefault();
+					}
+
 					deltaY = currentTouchY - lastTouchY;
 					deltaTime = currentTouchTime - lastTouchTime;
 

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

@@ -11,6 +11,7 @@
 
 	var DEFAULT_DURATION = 500;
 	var DEFAULT_EASING = 'sqrt';
+	var DEFAULT_SCALE = 1;
 
 	var MENU_TOP_ATTR = 'data-menu-top';
 	var MENU_OFFSET_ATTR = 'data-menu-offset';
@@ -75,11 +76,24 @@
 		//Now get the targetTop to scroll to.
 		var targetTop;
 
-		//If there's a data-menu-top attribute, it overrides the actuall anchor offset.
-		var menuTop = link.getAttribute(MENU_TOP_ATTR);
+		var menuTop;
+
+		//If there's a handleLink function, it overrides the actual anchor offset.
+		if(_handleLink) {
+			menuTop = _handleLink(link);
+		}
+		//If there's a data-menu-top attribute and no handleLink function, it overrides the actual anchor offset.
+		else {
+			menuTop = link.getAttribute(MENU_TOP_ATTR);
+		}
 
 		if(menuTop !== null) {
-			targetTop = +menuTop;
+			//Is it a percentage offset?
+			if(/p$/.test(menuTop)) {
+				targetTop = (menuTop.slice(0, -1) / 100) * document.documentElement.clientHeight;
+			} else {
+				targetTop = +menuTop * _scale;
+			}
 		} else {
 			var scrollTarget = document.getElementById(href.substr(1));
 
@@ -142,6 +156,8 @@
 		_easing = options.easing || DEFAULT_EASING;
 		_animate = options.animate !== false;
 		_duration = options.duration || DEFAULT_DURATION;
+		_handleLink = options.handleLink;
+		_scale = options.scale || DEFAULT_SCALE;
 
 		if(typeof _duration === 'number') {
 			_duration = (function(duration) {
@@ -174,6 +190,8 @@
 	var _easing;
 	var _duration;
 	var _animate;
+	var _handleLink;
+	var _scale;
 
 	//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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skrollr-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.17
+  version: 0.6.18
 platform: ruby
 authors:
 - Nick Reed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2014-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails