Merge pull request #28 from owenliang/gh-pages

always calc touchmove changes
owenliang · Apr 4, 2017 · 9bc2b26 · 9bc2b26
2 parents 174d35d + 0fa2aee
commit 9bc2b26
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/pullToRefresh.js b/pullToRefresh.js
@@ -231,21 +231,22 @@ function (container, option) {
                 return;
             }
 
-            // 滚动条必须到达顶部,才开始下拉刷新动画
+            // 计算每个变化的手指, 取变化最大的delta
             var maxDelta = 0;
-            if (iscroll.y != 0) {
-                return;
-            } else { // 计算每个变化的手指, 取变化最大的delta
-                for (var i = 0; i < event.originalEvent.changedTouches.length; ++i) {
-                    var fingerTouch = event.originalEvent.changedTouches[i];
-                    if (touchEvent[fingerTouch.identifier] !== null) {
-                        var delta = fingerTouch.clientY - touchEvent[fingerTouch.identifier];
-                        if (Math.abs(delta) > Math.abs(maxDelta)) {
-                            maxDelta = delta;
-                        }
+            for (var i = 0; i < event.originalEvent.changedTouches.length; ++i) {
+                var fingerTouch = event.originalEvent.changedTouches[i];
+                if (touchEvent[fingerTouch.identifier] !== null) {
+                    var delta = fingerTouch.clientY - touchEvent[fingerTouch.identifier];
+                    if (Math.abs(delta) > Math.abs(maxDelta)) {
+                        maxDelta = delta;
                     }
-                    touchEvent[fingerTouch.identifier] = fingerTouch.clientY;
                 }
+                touchEvent[fingerTouch.identifier] = fingerTouch.clientY;
+            }
+
+            // 滚动条必须到达顶部,才开始下拉刷新动画
+            if (iscroll.y != 0) {
+                return;
             }
 
             // 图标的目标位置