You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ji...@apache.org on 2017/01/24 08:21:30 UTC
[19/50] [abbrv] incubator-weex git commit: * [ios] prevent loadmore
event from being triggered while pulling down.
* [ios] prevent loadmore event from being triggered while pulling down.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9b6f726a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9b6f726a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9b6f726a
Branch: refs/heads/master
Commit: 9b6f726aa370a92dc10bb41673f40b6334846f9e
Parents: eb03cb0
Author: \u9690\u98ce <cx...@gmail.com>
Authored: Wed Jan 11 10:53:38 2017 +0800
Committer: \u9690\u98ce <cx...@gmail.com>
Committed: Wed Jan 11 10:53:38 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9b6f726a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
index c10f947..fa91d3e 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
@@ -333,7 +333,7 @@ WX_EXPORT_METHOD(@selector(resetLoadmore))
- (BOOL)isNeedLoadMore
{
- if (_loadMoreOffset >= 0.0) {
+ if (_loadMoreOffset >= 0.0 && ((UIScrollView *)self.view).contentOffset.y >= 0) {
return _previousLoadMoreContentHeight != ((UIScrollView *)self.view).contentSize.height && ((UIScrollView *)self.view).contentSize.height - ((UIScrollView *)self.view).contentOffset.y - self.view.frame.size.height <= _loadMoreOffset;
}