skrollr-rails 0.6.13 → 0.6.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f74f6fbadf8a2c8c6472aa99d0b34dbb1b54603
-  data.tar.gz: bbfe9617ee28c2de950fc818694a77fbf8a65a4b
+  metadata.gz: b3c41d26cb578a74c6406c0ac39ad512e4ceb579
+  data.tar.gz: 0ec5f20f4b4ee77a879d5a76cf39931b198da260
 SHA512:
-  metadata.gz: a67c6e9f466c1ea939cf5311ae6d9829a55d976c304313338e41c1b148bf3d56a352a52246ecb5faf58aed8d9380aff92c8e1a1dfbb7e84a8bd5308fcc456b86
-  data.tar.gz: 9f0879543a7b8d36a83c207a7762cfa10ca25634175ad8b156b515f7dab747d6ef4ab53e40acf3258338f319d9c9f23e8f1666af60372d3348fcd94e58674ab2
+  metadata.gz: 9c35869f0600a4dcdff752302721526c47b23b016dcf831408cd4b762e22089edaf7e56406387c26eb24233826dba27bf75c7df394b1d6fbf5a7e87a05a767d8
+  data.tar.gz: c65f1da2156b59aa77fa6f278fd0c595ff4c3e60481c6e766a2b66f5059edbe9b446f1d518914d98ff47326226629eaffccfd094adccc5bf889590da426ee0e3

data/lib/skrollr-rails/version.rb

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

data/vendor/assets/javascripts/skrollr.js

@@ -19,7 +19,7 @@
 		init: function(options) {
 			return _instance || new Skrollr(options);
 		},
-		VERSION: '0.6.13'
+		VERSION: '0.6.14'
 	};
 
 	//Minify optimization.
@@ -581,11 +581,7 @@
 	};
 
 	Skrollr.prototype.setScrollTop = function(top, force) {
-		//Don't do smooth scrolling (last top === new top).
-		if(force === true) {
-			_lastTop = top;
-			_forceRender = true;
-		}
+		_forceRender = (force === true);
 
 		if(_isMobile) {
 			_mobileOffset = Math.min(Math.max(top, 0), _maxKeyFrame);
@@ -756,7 +752,7 @@
 
 					duration = duration * (1 - targetRatio);
 
-					_instance.animateTo(targetTop, {easing: 'outCubic', duration: duration});
+					_instance.animateTo((targetTop + 0.5) | 0, {easing: 'outCubic', duration: duration});
 					break;
 			}
 		});
@@ -982,8 +978,8 @@
 
 			_instance.setScrollTop(renderTop, true);
 		}
-		//Smooth scrolling only if there's no animation running and if we're not on mobile.
-		else if(!_isMobile) {
+		//Smooth scrolling only if there's no animation running and if we're not forcing the rendering.
+		else if(!_forceRender) {
 			var smoothScrollingDiff = _smoothScrolling.targetTop - renderTop;
 
 			//The user scrolled, start new smooth scrolling.
@@ -1015,7 +1011,7 @@
 		//Did the scroll position even change?
 		if(_forceRender || _lastTop !== renderTop) {
 			//Remember in which direction are we scrolling?
-			_direction = (renderTop >= _lastTop) ? 'down' : 'up';
+			_direction = (renderTop > _lastTop) ? 'down' : (renderTop < _lastTop ? 'up' : _direction);
 
 			_forceRender = false;
 

metadata

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