From 0fa2aeea0b31ea3654861c366a59d88937efd265 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E6=A0=8B?= <120848369@qq.com> Date: Tue, 4 Apr 2017 19:25:56 +0800 Subject: [PATCH] always calc touchmove changes --- pullToRefresh.js | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pullToRefresh.js b/pullToRefresh.js index afe5679..de73fcc 100644 --- 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; } // 图标的目标位置