skrollr-rails 0.6.18 → 0.6.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b0711aeba31d3dfacb79fbe8b261990286913e5
-  data.tar.gz: 1e037a545ae4cbe7fad4a922f86c9ddf48af51f7
+  metadata.gz: 66fe5b35160a73d4e2c206e315d823943d2e66b0
+  data.tar.gz: b97ea67a6a57614a746ebcfe1ae2d5995ba0aded
 SHA512:
-  metadata.gz: b3846cc5e3288a4ef106d71a3eb3d23ca51565e91af38d7b7f94d130045249fea37af10d00e797da563aeb87955630946797693cd5c659bb27c221694db3aa96
-  data.tar.gz: e4ab8a4af0572e44dc4d03ddf16e9040c851726462d40b23d8aa4e6fb031c4b024f0cfdc71fbc6e43bb66f4b9bbec5f06f6ea7b0dfe0c194693b92bc6ff1ac3e
+  metadata.gz: 80d7073ee02e87a92a17128638b6e47972a9c9a9a8470cded692756e5aa7d41d54a6df04636b029d785e81fd031ee2b1ba858f321bcb2c3941da0401c4b2ba4a
+  data.tar.gz: 63f1d21853374045bb7aae2142d4adaf1175e7a48096599dd594d3a0c558af3559695879f2587a8457f7375664af55b30268cf14ccd0652ca033989c09a63dc3

data/lib/skrollr-rails/version.rb

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

data/vendor/assets/javascripts/skrollr.js

@@ -19,7 +19,7 @@
 		init: function(options) {
 			return _instance || new Skrollr(options);
 		},
-		VERSION: '0.6.17'
+		VERSION: '0.6.19'
 	};
 
 	//Minify optimization.
@@ -401,18 +401,20 @@
 
 				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;
+				if(constant) {
+					//Strip the underscore prefix.
+					kf.constant = constant.substr(1);
+				}
 
-				//Parse key frame offset. If undefined will be casted to 0.
+				//Get the key frame offset.
 				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;
+					kf.offset = (offset.slice(0, -1) | 0) / 100;
 				} else {
-					kf.offset = (offset | 0) + constant;
+					kf.offset = (offset | 0);
 				}
 
 				var anchor1 = match[3];
@@ -430,9 +432,7 @@
 					} 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 = kf.offset * _scale;
-
-						delete kf.offset;
+						kf.offset = kf.offset * _scale;
 					}
 				}
 				//"relative" mode, where numbers are relative to anchors.
@@ -790,10 +790,13 @@
 	};
 
 	/**
-	 * Updates key frames which depend on others.
+	 * Updates key frames which depend on others / need to be updated on resize.
 	 * That is "end" in "absolute" mode and all key frames in "relative" mode.
+	 * Also handles constants, because they may change on resize.
 	 */
 	var _updateDependentKeyFrames = function() {
+		var viewportHeight = documentElement.clientHeight;
+		var processedConstants = _processConstants();
 		var skrollable;
 		var element;
 		var anchorTarget;
@@ -803,6 +806,8 @@
 		var kf;
 		var skrollableIndex;
 		var skrollablesLength;
+		var offset;
+		var constantValue;
 
 		//First process all relative-mode elements and find the max key frame.
 		skrollableIndex = 0;
@@ -820,11 +825,14 @@
 			for(; keyFrameIndex < keyFramesLength; keyFrameIndex++) {
 				kf = keyFrames[keyFrameIndex];
 
-				var offset = kf.offset;
+				offset = kf.offset;
+				constantValue = processedConstants[kf.constant] || 0;
+
+				kf.frame = offset;
 
 				if(kf.isPercentage) {
 					//Convert the offset to percentage of the viewport height.
-					offset = offset * documentElement.clientHeight;
+					offset = offset * viewportHeight;
 
 					//Absolute + percentage mode.
 					kf.frame = offset;
@@ -838,6 +846,8 @@
 					_reset(element, true);
 				}
 
+				kf.frame += constantValue;
+
 				//Only search for max key frame when forceHeight is enabled.
 				if(_forceHeight) {
 					//Find the max key frame, but don't use one of the data-end ones for comparison.
@@ -865,8 +875,10 @@
 			for(; keyFrameIndex < keyFramesLength; keyFrameIndex++) {
 				kf = keyFrames[keyFrameIndex];
 
+				constantValue = processedConstants[kf.constant] || 0;
+
 				if(kf.isEnd) {
-					kf.frame = _maxKeyFrame - kf.offset;
+					kf.frame = _maxKeyFrame - kf.offset + constantValue;
 				}
 			}
 
@@ -1447,6 +1459,32 @@
 		_forceRender = true;
 	};
 
+	/*
+	 * Returns a copy of the constants object where all functions and strings have been evaluated.
+	 */
+	var _processConstants = function() {
+		var viewportHeight = documentElement.clientHeight;
+		var copy = {};
+		var prop;
+		var value;
+
+		for(prop in _constants) {
+			value = _constants[prop];
+
+			if(typeof value === 'function') {
+				value = value.call(_instance);
+			}
+			//Percentage offset.
+			else if((/p$/).test(value)) {
+				value = (value.substr(0, -1) / 100) * viewportHeight;
+			}
+
+			copy[prop] = value;
+		}
+
+		return copy;
+	};
+
 	/*
 	 * Returns the height of the document.
 	 */

metadata

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