Skip to content

Commit 9bc2b26

Browse files
authored
Merge pull request #28 from owenliang/gh-pages
always calc touchmove changes
2 parents 174d35d + 0fa2aee commit 9bc2b26

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

pullToRefresh.js

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -231,21 +231,22 @@ function (container, option) {
231231
return;
232232
}
233233

234-
// 滚动条必须到达顶部,才开始下拉刷新动画
234+
// 计算每个变化的手指, 取变化最大的delta
235235
var maxDelta = 0;
236-
if (iscroll.y != 0) {
237-
return;
238-
} else { // 计算每个变化的手指, 取变化最大的delta
239-
for (var i = 0; i < event.originalEvent.changedTouches.length; ++i) {
240-
var fingerTouch = event.originalEvent.changedTouches[i];
241-
if (touchEvent[fingerTouch.identifier] !== null) {
242-
var delta = fingerTouch.clientY - touchEvent[fingerTouch.identifier];
243-
if (Math.abs(delta) > Math.abs(maxDelta)) {
244-
maxDelta = delta;
245-
}
236+
for (var i = 0; i < event.originalEvent.changedTouches.length; ++i) {
237+
var fingerTouch = event.originalEvent.changedTouches[i];
238+
if (touchEvent[fingerTouch.identifier] !== null) {
239+
var delta = fingerTouch.clientY - touchEvent[fingerTouch.identifier];
240+
if (Math.abs(delta) > Math.abs(maxDelta)) {
241+
maxDelta = delta;
246242
}
247-
touchEvent[fingerTouch.identifier] = fingerTouch.clientY;
248243
}
244+
touchEvent[fingerTouch.identifier] = fingerTouch.clientY;
245+
}
246+
247+
// 滚动条必须到达顶部,才开始下拉刷新动画
248+
if (iscroll.y != 0) {
249+
return;
249250
}
250251

251252
// 图标的目标位置

0 commit comments

Comments
 (0)