skrollr-rails 0.6.9 → 0.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5626de761b7901972f19f4277355e76216f0618
-  data.tar.gz: 8c4c9c685a9401950575be87ad5fb6c42fb64790
+  metadata.gz: 12d689b283db05c2e2325eaae0848337f8e58fdc
+  data.tar.gz: 97be794435803db1a642af6ab8bfea580c3cd710
 SHA512:
-  metadata.gz: 76583ccee883c1694638fffa79ae619be25200559ece7d1fbe4807fb4764509e12bbf665edd8ca84bbcbf56645cd5025cda8a8b6f4743092f0c3568a88bc109d
-  data.tar.gz: d76f4d63911bb8d79cee67f12ab11aab2292ec14fcab0ded1105a961fe9e237bf57d45a708f23546863730a2b1af26d28405b9bf136316a9b56f929f5b20a721
+  metadata.gz: fac5868bc844e5ced65c3c616367b1276dd3c3a7a9d617cd76a8f498d9ba32678974dbad8f306c1b60d14fd4604b79e0c7578b38adc9d9397e62f666a4c4c901
+  data.tar.gz: 198cb2c74d10d22f6b1cbd18bfddb5c8604ba330fc704745bcbebae5f84a1d64f0cf671ddff5c834fbee20b1bec934266dd671a3434fef22c14afd465df8fba6

data/lib/skrollr-rails/version.rb

@@ -1,5 +1,5 @@
 module Skrollr
   module Rails
-    VERSION = "0.6.9"
+    VERSION = "0.6.10"
   end
 end

data/vendor/assets/javascripts/skrollr.js

@@ -19,7 +19,7 @@
 		init: function(options) {
 			return _instance || new Skrollr(options);
 		},
-		VERSION: '0.6.9'
+		VERSION: '0.6.10'
 	};
 
 	//Minify optimization.
@@ -274,7 +274,18 @@
 		//Triggers parsing of elements and a first reflow.
 		_instance.refresh();
 
-		_addEvent(window, 'resize orientationchange', _reflow);
+		_addEvent(window, 'resize orientationchange', function() {
+			var width = documentElement.clientWidth;
+			var height = documentElement.clientHeight;
+
+			//Only reflow if the size actually changed (#271).
+			if(height !== _lastViewportHeight || width !== _lastViewportWidth) {
+				_lastViewportHeight = height;
+				_lastViewportWidth = width;
+
+				_requestReflow = true;
+			}
+		});
 
 		var requestAnimFrame = polyfillRAF();
 
@@ -863,6 +874,11 @@
 	 * Renders all elements.
 	 */
 	var _render = function() {
+		if(_requestReflow) {
+			_requestReflow = false;
+			_reflow();
+		}
+
 		//We may render something else than the actual scrollbar position.
 		var renderTop = _instance.getScrollTop();
 
@@ -1436,6 +1452,12 @@
 	//The last time we called the render method (doesn't mean we rendered!).
 	var _lastRenderCall = _now();
 
+	//For detecting if it actually resized (#271).
+	var _lastViewportWidth = 0;
+	var _lastViewportHeight = 0;
+
+	var _requestReflow = false;
+
 	//Will contain data about a running scrollbar animation, if any.
 	var _scrollAnimation;
 

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

@@ -104,7 +104,7 @@
 		//Now finally scroll there.
 		if(_animate && !fake) {
 			_skrollrInstance.animateTo(targetTop, {
-				duration: _duration,
+				duration: _duration(_skrollrInstance.getScrollTop(), targetTop),
 				easing: _easing
 			});
 		} else {
@@ -129,9 +129,17 @@
 
 		options = options || {};
 
-		_duration = options.duration || DEFAULT_DURATION;
 		_easing = options.easing || DEFAULT_EASING;
 		_animate = options.animate !== false;
+		_duration = options.duration || DEFAULT_DURATION;
+
+		if(typeof _duration === 'number') {
+			_duration = (function(duration) {
+				return function() {
+					return duration;
+				};
+			}(_duration));
+		}
 
 		//Use event bubbling and attach a single listener to the document.
 		skrollr.addEvent(document, 'click', handleClick);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skrollr-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.6.10
 platform: ruby
 authors:
 - Nick Reed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails