* [ios] bugfix pulling down event
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/4d89fea5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4d89fea5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4d89fea5
Branch: refs/heads/0.11-dev
Commit: 4d89fea51b39da00c3482a21c906a2c1225a371a
Parents: a1a0b69
Author: acton393 <zh...@gmail.com>
Authored: Fri Feb 24 11:27:43 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri Feb 24 11:27:43 2017 +0800
----------------------------------------------------------------------
.../WeexSDK/Sources/Component/WXRefreshComponent.h | 6 +++---
.../WeexSDK/Sources/Component/WXScrollerComponent.m | 16 ++++++++--------
2 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4d89fea5/ios/sdk/WeexSDK/Sources/Component/WXRefreshComponent.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXRefreshComponent.h b/ios/sdk/WeexSDK/Sources/Component/WXRefreshComponent.h
index 0081f31..73bddd3 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXRefreshComponent.h
+++ b/ios/sdk/WeexSDK/Sources/Component/WXRefreshComponent.h
@@ -8,9 +8,9 @@
#import "WXComponent.h"
-#define DISTANCE_Y @"dy"
-#define PULLING_DISTANCE @"pullingDistance"
-#define VIEW_HEIGHT @"viewHeight"
+#define REFRESH_DISTANCE_Y @"dy"
+#define REFRESH_HEADERHEIGHT @"headerHeight"
+#define REFRESH_MAXHEIGHT @"maxHeight"
@interface WXRefreshComponent : WXComponent
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4d89fea5/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 5b8fe9a..7723ba5 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
@@ -424,14 +424,14 @@ WX_EXPORT_METHOD(@selector(resetLoadmore))
} else if(_lastContentOffset.y < scrollView.contentOffset.y) {
_direction = @"up";
}
- if (scrollView.dragging) {
- [_refreshComponent pullingdown:@{
- DISTANCE_Y: @(fabs(scrollView.contentOffset.y - _lastContentOffset.y)),
- PULLING_DISTANCE: @(scrollView.contentOffset.y),
- VIEW_HEIGHT: @(_refreshComponent.view.frame.size.height),
- @"type":@"pullingdown"
- }];
- }
+
+ [_refreshComponent pullingdown:@{
+ REFRESH_DISTANCE_Y: @(fabs(scrollView.contentOffset.y)),
+ REFRESH_MAXHEIGHT: @(_refreshComponent.view.frame.size.height),
+ REFRESH_HEADERHEIGHT: @(_refreshComponent.view.frame.size.height),
+ @"type":@"pullingdown"
+ }];
+
_lastContentOffset = scrollView.contentOffset;
// check sticky