skrollr-rails 0.6.22 → 0.6.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7681b7cf05eab4cabbae4708167390e606c00f8b
-  data.tar.gz: 1f739ab6696b37823f92d5ac3a4a85806f7bbabd
+  metadata.gz: 7d129c8969be774ce9a3c6daded5a213e6b32107
+  data.tar.gz: 574fc526d377b22f74f677297d7d3445108b83f4
 SHA512:
-  metadata.gz: e243ff24d9a255989424da22f04a2d8b29b8eae8673b01ad57b78818f2896a083f185fc9b5fa5306ca4b031d7b19109d704ad3d03bd411e66b7911678376a5bd
-  data.tar.gz: d21ba43373b515995e5b1081f3cb6af3e8ef1194c639441568a1054ec399633530c23d25abe2e3644aca5b2254dd9dadc79544d9fa156fb4ad0d1511edd26afc
+  metadata.gz: dab9b26c46dda850da2444febc03dda3d1aef4affc5228602bb97d55ed00daa0d7ead9e1952cb49d0702288daff8e6a664f14f46bc5ed3c239fa220be31b4d50
+  data.tar.gz: 5f1a1c1d4e4fcc10b97a0a653f44cae0651be14fb37dbcb570bb7ce796ea64159f03d6bda3198855fdebdf07f1626a47a2e2308bf287203220a1b7925a71e9a0

data/lib/skrollr-rails/version.rb

@@ -1,5 +1,5 @@
 module Skrollr
   module Rails
-    VERSION = "0.6.22"
+    VERSION = "0.6.23"
   end
 end

data/vendor/assets/javascripts/skrollr.js

@@ -72,7 +72,7 @@
 	//Easing function names follow the property in square brackets.
 	var rxPropEasing = /^([a-z\-]+)\[(\w+)\]$/;
 
-	var rxCamelCase = /-([a-z])/g;
+	var rxCamelCase = /-([a-z0-9_])/g;
 	var rxCamelCaseFn = function(str, letter) {
 		return letter.toUpperCase();
 	};
@@ -248,7 +248,10 @@
 			beforerender: options.beforerender,
 
 			//Function to be called right after finishing rendering.
-			render: options.render
+			render: options.render,
+
+			//Function to be called whenever an element with the `data-emit-events` attribute passes a keyframe.
+			keyframe: options.keyframe
 		};
 
 		//forceHeight is true by default
@@ -331,9 +334,9 @@
 			_skrollableIdCounter = 0;
 
 			elements = document.getElementsByTagName('*');
-		} else {
-			//We accept a single element or an array of elements.
-			elements = [].concat(elements);
+		} else if(elements.length === undefined) {
+			//We also accept a single element as parameter.
+			elements = [elements];
 		}
 
 		elementIndex = 0;
@@ -350,6 +353,14 @@
 			//The edge strategy for this particular element.
 			var edgeStrategy = _edgeStrategy;
 
+			//If this particular element should emit keyframe events.
+			var emitEvents = false;
+
+			//If we're reseting the counter, remove any old element ids that may be hanging around.
+			if(ignoreID) {
+				delete el[SKROLLABLE_ID_DOM_PROPERTY];
+			}
+
 			if(!el.attributes) {
 				continue;
 			}
@@ -385,6 +396,13 @@
 					continue;
 				}
 
+				//Is this element tagged with the `data-emit-events` attribute?
+				if(attr.name === 'data-emit-events') {
+					emitEvents = true;
+
+					continue;
+				}
+
 				var match = attr.name.match(rxKeyframeAttribute);
 
 				if(match === null) {
@@ -394,7 +412,9 @@
 				var kf = {
 					props: attr.value,
 					//Point back to the element as well.
-					element: el
+					element: el,
+					//The name of the event which this keyframe will fire, if emitEvents is
+					eventType: attr.name.replace(rxCamelCase, rxCamelCaseFn)
 				};
 
 				keyFrames.push(kf);
@@ -471,7 +491,9 @@
 				anchorTarget: anchorTarget,
 				keyFrames: keyFrames,
 				smoothScrolling: smoothScrollThis,
-				edgeStrategy: edgeStrategy
+				edgeStrategy: edgeStrategy,
+				emitEvents: emitEvents,
+				lastFrameIndex: -1
 			};
 
 			_updateClass(el, [SKROLLABLE_CLASS], []);
@@ -582,6 +604,10 @@
 		return !!_scrollAnimation;
 	};
 
+	Skrollr.prototype.isMobile = function() {
+		return _isMobile;
+	};
+
 	Skrollr.prototype.setScrollTop = function(top, force) {
 		_forceRender = (force === true);
 
@@ -901,11 +927,14 @@
 			var element = skrollable.element;
 			var frame = skrollable.smoothScrolling ? fakeFrame : actualFrame;
 			var frames = skrollable.keyFrames;
-			var firstFrame = frames[0].frame;
-			var lastFrame = frames[frames.length - 1].frame;
-			var beforeFirst = frame < firstFrame;
-			var afterLast = frame > lastFrame;
-			var firstOrLastFrame = frames[beforeFirst ? 0 : frames.length - 1];
+			var framesLength = frames.length;
+			var firstFrame = frames[0];
+			var lastFrame = frames[frames.length - 1];
+			var beforeFirst = frame < firstFrame.frame;
+			var afterLast = frame > lastFrame.frame;
+			var firstOrLastFrame = beforeFirst ? firstFrame : lastFrame;
+			var emitEvents = skrollable.emitEvents;
+			var lastFrameIndex = skrollable.lastFrameIndex;
 			var key;
 			var value;
 
@@ -918,7 +947,23 @@
 				}
 
 				//Add the skrollr-before or -after class.
-				_updateClass(element, [beforeFirst ? SKROLLABLE_BEFORE_CLASS : SKROLLABLE_AFTER_CLASS], [SKROLLABLE_BEFORE_CLASS, SKROLLABLE_BETWEEN_CLASS, SKROLLABLE_AFTER_CLASS]);
+				if(beforeFirst) {
+					_updateClass(element, [SKROLLABLE_BEFORE_CLASS], [SKROLLABLE_AFTER_CLASS, SKROLLABLE_BETWEEN_CLASS]);
+
+					//This handles the special case where we exit the first keyframe.
+					if(emitEvents && lastFrameIndex > -1) {
+						_emitEvent(element, firstFrame.eventType, _direction);
+						skrollable.lastFrameIndex = -1;
+					}
+				} else {
+					_updateClass(element, [SKROLLABLE_AFTER_CLASS], [SKROLLABLE_BEFORE_CLASS, SKROLLABLE_BETWEEN_CLASS]);
+
+					//This handles the special case where we exit the last keyframe.
+					if(emitEvents && lastFrameIndex < framesLength) {
+						_emitEvent(element, lastFrame.eventType, _direction);
+						skrollable.lastFrameIndex = framesLength;
+					}
+				}
 
 				//Remember that we handled the edge case (before/after the first/last keyframe).
 				skrollable.edge = beforeFirst ? -1 : 1;
@@ -955,9 +1000,8 @@
 
 			//Find out between which two key frames we are right now.
 			var keyFrameIndex = 0;
-			var framesLength = frames.length - 1;
 
-			for(; keyFrameIndex < framesLength; keyFrameIndex++) {
+			for(; keyFrameIndex < framesLength - 1; keyFrameIndex++) {
 				if(frame >= frames[keyFrameIndex].frame && frame <= frames[keyFrameIndex + 1].frame) {
 					var left = frames[keyFrameIndex];
 					var right = frames[keyFrameIndex + 1];
@@ -978,6 +1022,22 @@
 						}
 					}
 
+					//Are events enabled on this element?
+					//This code handles the usual cases of scrolling through different keyframes.
+					//The special cases of before first and after last keyframe are handled above.
+					if(emitEvents) {
+						//Did we pass a new keyframe?
+						if(lastFrameIndex !== keyFrameIndex) {
+							if(_direction === 'down') {
+								_emitEvent(element, left.eventType, _direction);
+							} else {
+								_emitEvent(element, right.eventType, _direction);
+							}
+
+							skrollable.lastFrameIndex = keyFrameIndex;
+						}
+					}
+
 					break;
 				}
 			}
@@ -1371,6 +1431,7 @@
 			if(!e.preventDefault) {
 				e.preventDefault = function() {
 					e.returnValue = false;
+					e.defaultPrevented = true;
 				};
 			}
 
@@ -1430,6 +1491,12 @@
 		_registeredEvents = [];
 	};
 
+	var _emitEvent = function(element, name, direction) {
+		if(_listeners.keyframe) {
+			_listeners.keyframe.call(_instance, element, name, direction);
+		}
+	};
+
 	var _reflow = function() {
 		var pos = _instance.getScrollTop();
 
@@ -1689,4 +1756,4 @@
 		window.skrollr = skrollr;
 	}
 
-}(window, document));
+}(window, document));

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

@@ -25,16 +25,16 @@
 		might not acutally be the link but a child.
 	*/
 	var findParentLink = function(element) {
-		//Yay, it's a link!
-		if(element.tagName === 'A') {
-			return element;
-		}
-
 		//We reached the top, no link found.
 		if(element === document) {
 			return false;
 		}
 
+		//Yay, it's a link!
+		if(element.tagName.toUpperCase() === 'A') {
+			return element;
+		}
+
 		//Maybe the parent is a link.
 		return findParentLink(element.parentNode);
 	};

metadata

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