You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/03/17 07:11:25 UTC

[21/40] incubator-weex git commit: * [ios] fix pulling down event fire time

* [ios] fix pulling down event fire time


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/374361f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/374361f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/374361f5

Branch: refs/heads/0.12-dev
Commit: 374361f575abe0b567985393efe334a1ff1b2f33
Parents: d9907e9
Author: acton393 <zh...@gmail.com>
Authored: Thu Mar 16 11:04:10 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Thu Mar 16 11:04:10 2017 +0800

----------------------------------------------------------------------
 ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/374361f5/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 f931815..50dc059 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
@@ -436,14 +436,12 @@ WX_EXPORT_METHOD(@selector(resetLoadmore))
     _lastContentOffset = scrollView.contentOffset;
     
     CGFloat scaleFactor = self.weexInstance.pixelScaleFactor;
-    if ([_refreshComponent displayState] && scrollView.dragging) {
-        [_refreshComponent pullingdown:@{
+    [_refreshComponent pullingdown:@{
              REFRESH_DISTANCE_Y: @(fabs((scrollView.contentOffset.y - _lastContentOffset.y)/scaleFactor)),
              REFRESH_VIEWHEIGHT: @(_refreshComponent.view.frame.size.height/scaleFactor),
              REFRESH_PULLINGDISTANCE: @(scrollView.contentOffset.y/scaleFactor),
              @"type":@"pullingdown"
-         }];
-    }
+    }];
 
     // check sticky
     [self adjustSticky];