skrollr-rails 0.6.12 → 0.6.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd1110115e2221306a0b9ca1328d3f4b9cd479fe
-  data.tar.gz: d8f4e8937b43441aa2a794b08b8f31d9c63a0429
+  metadata.gz: 3f74f6fbadf8a2c8c6472aa99d0b34dbb1b54603
+  data.tar.gz: bbfe9617ee28c2de950fc818694a77fbf8a65a4b
 SHA512:
-  metadata.gz: 261db4165ac4cfe9ad793a03b56facc944e807c77e0c8de3468af1a6d8666911a3caf2e4061a8dce6cb84d2cc058481141c25c7d30a61eb3eb393a8e2bbda5d5
-  data.tar.gz: acc368b3991fa3ba7d05df1637eb028742e47c8c2b1a215683e9cd5382fbafe5ec200284158957dd94b7b553b7fce2366bbb6f02d2015516d8706312a65a4362
+  metadata.gz: a67c6e9f466c1ea939cf5311ae6d9829a55d976c304313338e41c1b148bf3d56a352a52246ecb5faf58aed8d9380aff92c8e1a1dfbb7e84a8bd5308fcc456b86
+  data.tar.gz: 9f0879543a7b8d36a83c207a7762cfa10ca25634175ad8b156b515f7dab747d6ef4ab53e40acf3258338f319d9c9f23e8f1666af60372d3348fcd94e58674ab2

data/lib/skrollr-rails/version.rb

@@ -1,5 +1,5 @@
 module Skrollr
   module Rails
-    VERSION = "0.6.12"
+    VERSION = "0.6.13"
   end
 end

data/vendor/assets/javascripts/skrollr.js

@@ -19,7 +19,7 @@
 		init: function(options) {
 			return _instance || new Skrollr(options);
 		},
-		VERSION: '0.6.12'
+		VERSION: '0.6.13'
 	};
 
 	//Minify optimization.
@@ -63,7 +63,7 @@
 	var rxTrim = /^\s+|\s+$/g;
 
 	//Find all data-attributes. data-[_constant]-[offset]-[anchor]-[anchor].
-	var rxKeyframeAttribute = /^data(?:-(_\w+))?(?:-?(-?\d+))?(?:-?(start|end|top|center|bottom))?(?:-?(top|center|bottom))?$/;
+	var rxKeyframeAttribute = /^data(?:-(_\w+))?(?:-?(-?\d*\.?\d+p?))?(?:-?(start|end|top|center|bottom))?(?:-?(top|center|bottom))?$/;
 
 	var rxPropValue = /\s*([\w\-\[\]]+)\s*:\s*(.+?)\s*(?:;|$)/gi;
 
@@ -389,37 +389,46 @@
 					continue;
 				}
 
+				var kf = {
+					props: attr.value,
+					//Point back to the element as well.
+					element: el
+				};
+
+				keyFrames.push(kf);
+
 				var constant = match[1];
 
 				//If there is a constant, get it's value or fall back to 0.
 				constant = constant && _constants[constant.substr(1)] || 0;
 
 				//Parse key frame offset. If undefined will be casted to 0.
-				var offset = (match[2] | 0) + constant;
+				var offset = match[2];
+
+				//Is it a percentage offset?
+				if(/p$/.test(offset)) {
+					kf.isPercentage = true;
+					kf.offset = ((offset.slice(0, -1) | 0) + constant) / 100;
+				} else {
+					kf.offset = (offset | 0) + constant;
+				}
+
 				var anchor1 = match[3];
+
 				//If second anchor is not set, the first will be taken for both.
 				var anchor2 = match[4] || anchor1;
 
-				var kf = {
-					offset: offset,
-					props: attr.value,
-					//Point back to the element as well.
-					element: el
-				};
-
-				keyFrames.push(kf);
-
 				//"absolute" (or "classic") mode, where numbers mean absolute scroll offset.
 				if(!anchor1 || anchor1 === ANCHOR_START || anchor1 === ANCHOR_END) {
 					kf.mode = 'absolute';
 
-					//data-end needs to be calculated after all key frames are know.
+					//data-end needs to be calculated after all key frames are known.
 					if(anchor1 === ANCHOR_END) {
 						kf.isEnd = true;
-					} else {
+					} else if(!kf.isPercentage) {
 						//For data-start we can already set the key frame w/o calculations.
 						//#59: "scale" options should only affect absolute mode.
-						kf.frame = offset * _scale;
+						kf.frame = kf.offset * _scale;
 
 						delete kf.offset;
 					}
@@ -788,10 +797,20 @@
 			for(; keyFrameIndex < keyFramesLength; keyFrameIndex++) {
 				kf = keyFrames[keyFrameIndex];
 
+				var offset = kf.offset;
+
+				if(kf.isPercentage) {
+					//Convert the offset to percentage of the viewport height.
+					offset = offset * documentElement.clientHeight;
+
+					//Absolute + percentage mode.
+					kf.frame = offset;
+				}
+
 				if(kf.mode === 'relative') {
 					_reset(element);
 
-					kf.frame = _instance.relativeToAbsolute(anchorTarget, kf.anchors[0], kf.anchors[1]) - kf.offset;
+					kf.frame = _instance.relativeToAbsolute(anchorTarget, kf.anchors[0], kf.anchors[1]) - offset;
 
 					_reset(element, true);
 				}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skrollr-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.12
+  version: 0.6.13
 platform: ruby
 authors:
 - Nick Reed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-19 00:00:00.000000000 Z
+date: 2013-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails