Released 0.6.5.

oblador · Feb 20, 2015 · db40a77 · db40a77
1 parent a492cae
commit db40a77
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/angular-scroll.js b/angular-scroll.js
@@ -75,12 +75,12 @@ angular.module('duScroll.scrollHelpers', ['duScroll.requestAnimation'])
         deltaLeft = Math.round(left - startLeft),
         deltaTop = Math.round(top - startTop);
 
-    var startTime = null;
+    var startTime = null, progress = 0;
     var el = this;
 
     var cancelOnEvents = 'scroll mousedown mousewheel touchmove keydown';
     var cancelScrollAnimation = function($event) {
-      if (!$event || $event.which > 0) {
+      if (!$event || (progress && $event.which > 0)) {
         el.unbind(cancelOnEvents, cancelScrollAnimation);
         cancelAnimation(scrollAnimation);
         deferred.reject();
@@ -106,7 +106,7 @@ angular.module('duScroll.scrollHelpers', ['duScroll.requestAnimation'])
         startTime = timestamp;
       }
 
-      var progress = timestamp - startTime;
+      progress = timestamp - startTime;
       var percent = (progress >= duration ? 1 : easing(progress/duration));
 
       el.scrollTo(

diff --git a/angular-scroll.min.js b/angular-scroll.min.js
diff --git a/angular-scroll.min.js.map b/angular-scroll.min.js.map
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-scroll",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "main": "angular-scroll.js",
   "ignore": [
     "**/.*",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-scroll",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "description": "Scrollspy, animated scrollTo and scroll events",
   "keywords": [
     "angular",