You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by gu...@apache.org on 2017/10/18 04:16:50 UTC
[12/50] [abbrv] incubator-weex git commit: * [ios] add
WXScrollerComponentView and compatible iOS 11 new API
* [ios] add WXScrollerComponentView and compatible iOS 11 new API
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/35898590
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/35898590
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/35898590
Branch: refs/heads/master
Commit: 358985901ac778900b6eefbcf716e10244c0df22
Parents: 5e85cea
Author: acton393 <zh...@gmail.com>
Authored: Mon Oct 9 18:22:56 2017 +0800
Committer: gurisxie <27...@qq.com>
Committed: Mon Oct 9 19:53:06 2017 +0800
----------------------------------------------------------------------
.../WeexSDK/Sources/Component/WXScrollerComponent.m | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/35898590/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 88c934c..bf8021f 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
@@ -26,7 +26,15 @@
#import "WXUtility.h"
#import "WXLoadingComponent.h"
#import "WXRefreshComponent.h"
-@interface UIScrollView(WeexUIScrollerView_ContentInsetAdjustmentBehavior)
+
+@interface WXScrollerComponnetView:UIScrollView
+@end
+
+@implementation WXScrollerComponnetView
+@end;
+
+// add a category compatible for new API
+@interface WXScrollerComponnetView(WXScrollerComponnetView_ContentInsetAdjustmentBehavior)
@property(nonatomic, assign)NSUInteger contentInsetAdjustmentBehavior;
@end
@@ -139,14 +147,14 @@ WX_EXPORT_METHOD(@selector(resetLoadmore))
- (UIView *)loadView
{
- return [[UIScrollView alloc] init];
+ return [[WXScrollerComponnetView alloc] init];
}
- (void)viewDidLoad
{
[super viewDidLoad];
[self setContentSize:_contentSize];
- UIScrollView* scrollView = (UIScrollView *)self.view;
+ WXScrollerComponnetView* scrollView = (WXScrollerComponnetView *)self.view;
scrollView.delegate = self;
scrollView.exclusiveTouch = YES;
scrollView.autoresizesSubviews = NO;