skrollr-rails 0.6.5 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc392484b2d622dfbdc8c4ea6e03a3b5eeb8f8e5
-  data.tar.gz: 6c69ff25ca905d70b40f68f05c72026e515c8e2f
+  metadata.gz: 638e39f1ee200fe4cb80c1fee9cb42b9a96acf34
+  data.tar.gz: 645e9dee97c2c3cc5aabe6852f1cfa13cbdadd41
 SHA512:
-  metadata.gz: 3acb1b7751e38c669a7e4f95f121238b16f0b17f9faabcb52b57c5d6e1acbc85caa6ea4a0b6ab44458bc342fb52a6369d0e9304ec81ba0f4813b3a4593ee2d41
-  data.tar.gz: e119e409da9733d5a757c1cffbad6d3d19ddd6243f94ae835545a4e8e779fc684d33208dccf041a98e421d092e2b48b84db157efd152c5f45600e8530a1477ef
+  metadata.gz: 47e93132b9598841503046b1ac48f64836eb138e99bd66761e1dae0289245609f36eac2ccf1b2e959fb512aaec8045ead94c8db9fb7587fb7665befa6470dd05
+  data.tar.gz: 5b876404c7a083f84c82acab5a0f25edb0ce03aae20929ef7b906f342f86e729a71207e8b3dfd93ad39403ad543a909c7faf36f8b2bbd342a35de252131fdc50

data/lib/skrollr-rails/version.rb

@@ -1,5 +1,5 @@
 module Skrollr
   module Rails
-    VERSION = "0.6.5"
+    VERSION = "0.6.8"
   end
 end

data/vendor/assets/javascripts/skrollr.js

@@ -19,7 +19,7 @@
 		init: function(options) {
 			return _instance || new Skrollr(options);
 		},
-		VERSION: '0.6.5'
+		VERSION: '0.6.8'
 	};
 
 	//Minify optimization.
@@ -50,7 +50,7 @@
 	var DEFAULT_DURATION = 1000;//ms
 	var MOBILE_DECELERATION = 0.0006;//pixel/ms²
 
-	var SMOOTH_SCROLLING_DURATION = 200;
+	var DEFAULT_SMOOTH_SCROLLING_DURATION = 200;//ms
 
 	var ANCHOR_START = 'start';
 	var ANCHOR_END = 'end';
@@ -227,7 +227,7 @@
 			}
 		}
 
-		_edgeStrategy = options.edgeStrategy || 'ease';
+		_edgeStrategy = options.edgeStrategy || 'set';
 
 		_listeners = {
 			//Function to be called right before rendering.
@@ -245,6 +245,7 @@
 		}
 
 		_smoothScrollingEnabled = options.smoothScrolling !== false;
+		_smoothScrollingDuration = options.smoothScrollingDuration || DEFAULT_SMOOTH_SCROLLING_DURATION;
 
 		//Dummy object. Will be overwritten in the _render method when smooth scrolling is calculated.
 		_smoothScrolling = {
@@ -558,7 +559,7 @@
 			//That's were we actually "scroll" on mobile.
 			if(_skrollrBody) {
 				//Set the transform ("scroll it").
-				_setStyle(_skrollrBody, 'transform', 'translate(0, ' + -(_mobileOffset) + 'px) ' + _translateZ);
+				skrollr.setStyle(_skrollrBody, 'transform', 'translate(0, ' + -(_mobileOffset) + 'px) ' + _translateZ);
 			}
 		} else {
 			window.scrollTo(0, top);
@@ -805,6 +806,11 @@
 					case 'reset':
 						_reset(element);
 						continue;
+					case 'ease':
+						//Handle this case like it would be exactly at first/last keyframe and just pass it on.
+						frame = firstOrLastFrame.frame;
+						break;
+					default:
 					case 'set':
 						var props = firstOrLastFrame.props;
 
@@ -812,16 +818,11 @@
 							if(hasProp.call(props, key)) {
 								value = _interpolateString(props[key].value);
 
-								_setStyle(element, key, value);
+								skrollr.setStyle(element, key, value);
 							}
 						}
 
 						continue;
-					default:
-					case 'ease':
-						//Handle this case like it would be exactly at first/last keyframe and just pass it on.
-						frame = firstOrLastFrame.frame;
-						break;
 				}
 			} else {
 				//Did we handle an edge last time?
@@ -852,7 +853,7 @@
 
 							value = _interpolateString(value);
 
-							_setStyle(element, key, value);
+							skrollr.setStyle(element, key, value);
 						}
 					}
 
@@ -901,14 +902,14 @@
 					topDiff: renderTop - _lastTop,
 					targetTop: renderTop,
 					startTime: _lastRenderCall,
-					endTime: _lastRenderCall + SMOOTH_SCROLLING_DURATION
+					endTime: _lastRenderCall + _smoothScrollingDuration
 				};
 			}
 
 			//Interpolate the internal scroll position (not the actual scrollbar).
 			if(now <= _smoothScrolling.endTime) {
 				//Map the current progress to the new progress using easing function.
-				progress = easings.sqrt((now - _smoothScrolling.startTime) / SMOOTH_SCROLLING_DURATION);
+				progress = easings.sqrt((now - _smoothScrolling.startTime) / _smoothScrollingDuration);
 
 				renderTop = (_smoothScrolling.startTop + progress * _smoothScrolling.topDiff) | 0;
 			}
@@ -1172,7 +1173,7 @@
 	 */
 	var _detect3DTransforms = function() {
 		_translateZ = 'translateZ(0)';
-		_setStyle(_skrollrBody, 'transform', _translateZ);
+		skrollr.setStyle(_skrollrBody, 'transform', _translateZ);
 
 		var computedStyle = getStyle(_skrollrBody);
 		var computedTransform = computedStyle.getPropertyValue('transform');
@@ -1187,7 +1188,7 @@
 	/**
 	 * Set the CSS property on the given element. Sets prefixed properties as well.
 	 */
-	var _setStyle = skrollr.setStyle = function(el, prop, val) {
+	skrollr.setStyle = function(el, prop, val) {
 		var style = el.style;
 
 		//Camel case.
@@ -1438,6 +1439,8 @@
 
 	var _smoothScrollingEnabled;
 
+	var _smoothScrollingDuration;
+
 	//Will contain settins for smooth scrolling if enabled.
 	var _smoothScrolling;
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skrollr-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.8
 platform: ruby
 authors:
 - Nick Reed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-31 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -62,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Skrollr is a stand-alone parallax scrolling library for mobile and desktop.  This