Updated dist

zippy1978 · Aug 18, 2012 · 0d35b79 · 0d35b79
1 parent d8ceb24
commit 0d35b79
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/dist/jquery.scrollz.js b/dist/jquery.scrollz.js
@@ -495,17 +495,16 @@
     var previousTouchTime = _getTrackingData(instance, 'previousTouchTime');
     var duration = new Date() - previousTouchTime;
     var distance = previousTouchY - lastTouchY;
-    var speed = Math.abs(distance / duration);
+    var acceleration = Math.abs(distance / duration);
 
-    // Inertia move (with speed threshold)
-    if (settings.inertia && (speed > 0.50)) {
-      var offset = (Math.pow(speed, 2) * Math.abs(distance)) * 1.25;
+    if (settings.inertia) {
+      var offset = Math.pow(acceleration, 2) * 750;
       if (distance < 0) {
         offset *= -1;
       }
 
       container.stop(true, true);
-      container.animate({scrollTop: _fixContainerScrollTopBounds(instance, container.scrollTop() + offset)}, {duration: speed * 500, easing : 'easeOutCubic'});
+      container.animate({scrollTop: _fixContainerScrollTopBounds(instance, container.scrollTop() + offset)}, {duration: acceleration * 750, easing : 'easeOutCubic'});
     }
   }
 

diff --git a/dist/jquery.scrollz.min.js b/dist/jquery.scrollz.min.js
diff --git a/src/jquery.scrollz.js b/src/jquery.scrollz.js
@@ -493,13 +493,11 @@
     var distance = previousTouchY - lastTouchY;
     var acceleration = Math.abs(distance / duration);
 
-    console.log('acceleration = ' + acceleration + ' dist = ' + distance);
     if (settings.inertia) {
       var offset = Math.pow(acceleration, 2) * 750;
       if (distance < 0) {
         offset *= -1;
       }
-      console.log('off =' + offset);
 
       container.stop(true, true);
       container.animate({scrollTop: _fixContainerScrollTopBounds(instance, container.scrollTop() + offset)}, {duration: acceleration * 750, easing : 'easeOutCubic'});