skrollr-rails 0.6.16 → 0.6.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c81290ed073e2155007ec15149cf1bc759b6d53
-  data.tar.gz: 4ee1a773f944d7b1828037a3c5c80d82610f115a
+  metadata.gz: 0f2a4e524513a3fcc1bce8801cd4e0c4988582d1
+  data.tar.gz: 929ee48321fdc2726e0592fbf883123ebe30370f
 SHA512:
-  metadata.gz: bbd79792287a6d4c5dbfa56eaa208ee026600ccfb431c76d8498b3f9e891f7400fdfd2acd1923853eaf8b07c823a5f79e0e4b9ebc4965edc34ce6632ee06b26c
-  data.tar.gz: 30b55e4dea3e1e43ab48a3aa3b39f84da1767aeb969f5b9351b9c85479eecd49f2add883130a8ccfb20c88c12c922796eb01f48bea9e8b3f3f8bf38fb5011f28
+  metadata.gz: afdc7eff57a77a7cff835b81efd9394c7e28a01cf904c16683a52407ed5e2b9fa65f0db78b41cb95bef7e9545e1682afdc1751a73508126d9bf5e08db3c2fdb9
+  data.tar.gz: c6d2fca63f09370db4b16b36790ac0d564325c6543ff8ecaf21a04d66a5a7a17522780548199d3c768c04495c69aa080b2d41a3893ac3a73e5dc9f67075d4e0a

data/lib/skrollr-rails/version.rb

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

data/vendor/assets/javascripts/skrollr.js

@@ -19,7 +19,7 @@
 		init: function(options) {
 			return _instance || new Skrollr(options);
 		},
-		VERSION: '0.6.15'
+		VERSION: '0.6.17'
 	};
 
 	//Minify optimization.
@@ -60,6 +60,8 @@
 	//The property which will be added to the DOM element to hold the ID of the skrollable.
 	var SKROLLABLE_ID_DOM_PROPERTY = '___skrollable_id';
 
+	var rxTouchIgnoreTags = /^(?:input|textarea|button|select)$/i;
+
 	var rxTrim = /^\s+|\s+$/g;
 
 	//Find all data-attributes. data-[_constant]-[offset]-[anchor]-[anchor].
@@ -670,6 +672,7 @@
 		var initialElement;
 		var initialTouchY;
 		var initialTouchX;
+		var currentElement;
 		var currentTouchY;
 		var currentTouchX;
 		var lastTouchY;
@@ -681,14 +684,23 @@
 		var deltaTime;
 
 		_addEvent(documentElement, [EVENT_TOUCHSTART, EVENT_TOUCHMOVE, EVENT_TOUCHCANCEL, EVENT_TOUCHEND].join(' '), function(e) {
-			e.preventDefault();
-
 			var touch = e.changedTouches[0];
 
+			currentElement = e.target;
+
+			//We don't want text nodes.
+			while(currentElement.nodeType === 3) {
+				currentElement = currentElement.parentNode;
+			}
+
 			currentTouchY = touch.clientY;
 			currentTouchX = touch.clientX;
 			currentTouchTime = e.timeStamp;
 
+			if(!rxTouchIgnoreTags.test(currentElement.tagName)) {
+				e.preventDefault();
+			}
+
 			switch(e.type) {
 				case EVENT_TOUCHSTART:
 					//The last element we tapped on.
@@ -698,12 +710,7 @@
 
 					_instance.stopAnimateTo();
 
-					initialElement = e.target;
-
-					//We don't want text nodes.
-					while(initialElement.nodeType === 3) {
-						initialElement = initialElement.parentNode;
-					}
+					initialElement = currentElement;
 
 					initialTouchY = lastTouchY = currentTouchY;
 					initialTouchX = currentTouchX;
@@ -728,12 +735,14 @@
 
 					//Check if it was more like a tap (moved less than 7px).
 					if(distance2 < 49) {
-						initialElement.focus();
+						if(!rxTouchIgnoreTags.test(initialElement.tagName)) {
+							initialElement.focus();
 
-						//It was a tap, click the element.
-						var clickEvent = document.createEvent('MouseEvent');
-						clickEvent.initEvent('click', true, true);
-						initialElement.dispatchEvent(clickEvent);
+							//It was a tap, click the element.
+							var clickEvent = document.createEvent('MouseEvents');
+							clickEvent.initMouseEvent('click', true, true, e.view, 1, touch.screenX, touch.screenY, touch.clientX, touch.clientY, e.ctrlKey, e.altKey, e.shiftKey, e.metaKey, 0, null);
+							initialElement.dispatchEvent(clickEvent);
+						}
 
 						return;
 					}

metadata

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