You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ac...@apache.org on 2018/03/01 15:44:48 UTC
[1/2] incubator-weex git commit: * [iOS] remove compatible for Xcode
8.0
Repository: incubator-weex
Updated Branches:
refs/heads/master a59ddfe8d -> 38459c426
* [iOS] remove compatible for Xcode 8.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/2c61afd2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/2c61afd2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/2c61afd2
Branch: refs/heads/master
Commit: 2c61afd27e9776be22d4eb153daca9ff53966851
Parents: 9d11a5d
Author: acton393 <zh...@gmail.com>
Authored: Thu Mar 1 23:44:16 2018 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Thu Mar 1 23:44:16 2018 +0800
----------------------------------------------------------------------
.../Sources/Component/WXScrollerComponent.m | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c61afd2/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 5508fba..4ebaec5 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
@@ -35,10 +35,6 @@
@implementation WXScrollerComponnetView
@end
-@interface WXScrollerComponnetView(WXScrollerComponnetView_ContentInsetAdjustmentBehavior)
-@property(nonatomic, assign)NSUInteger contentInsetAdjustmentBehavior;
-@end
-
@interface WXScrollToTarget : NSObject
@property (nonatomic, weak) WXComponent *target;
@@ -189,12 +185,13 @@ WX_EXPORT_METHOD(@selector(resetLoadmore))
if (_alwaysScrollableVertical) {
scrollView.alwaysBounceVertical = [WXConvert BOOL:_alwaysScrollableVertical];
}
- if (WX_SYS_VERSION_GREATER_THAN_OR_EQUAL_TO(@"11.0")) {
- // now use the runtime to forbid the contentInset being Adjusted.
- // here we add a category for scoller component view class compatible for new API,
- // as we are concerning about weexSDK build as framework by Xcode8, using in Xcode9 project,
- // so the the macro __IPHONE_11_0 will be useless in this case.
- scrollView.contentInsetAdjustmentBehavior = 2;
+
+ if (@available(iOS 11.0, *)) {
+ if ([scrollView respondsToSelector:@selector(setContentInsetAdjustmentBehavior:)]) {
+ scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+ }
+ } else {
+ // Fallback on earlier versions
}
if (self.ancestorScroller) {
[2/2] incubator-weex git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into
merge-pull-request-master
Posted by ac...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-weex into merge-pull-request-master
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/38459c42
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/38459c42
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/38459c42
Branch: refs/heads/master
Commit: 38459c426c4d63f978b675c266c01f9a8ba43111
Parents: 2c61afd a59ddfe
Author: acton393 <zh...@gmail.com>
Authored: Thu Mar 1 23:44:39 2018 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Thu Mar 1 23:44:39 2018 +0800
----------------------------------------------------------------------
.../app/src/main/assets/weex_config_search.json | 36 +++++
.../java/com/alibaba/weex/WXApplication.java | 2 +
.../main/java/com/taobao/weex/InitConfig.java | 21 ++-
.../main/java/com/taobao/weex/WXSDKEngine.java | 5 +-
.../main/java/com/taobao/weex/WXSDKManager.java | 10 ++
.../taobao/weex/adapter/ClassLoaderAdapter.java | 56 +++++++
.../com/taobao/weex/bridge/WXModuleManager.java | 8 +-
.../java/com/taobao/weex/common/Constants.java | 6 +-
.../java/com/taobao/weex/dom/WXDomObject.java | 2 +-
.../taobao/weex/dom/WXRecyclerDomObject.java | 49 +++++-
.../com/taobao/weex/dom/WXTextDomObject.java | 11 +-
.../weex/ui/ExternalLoaderComponentHolder.java | 2 +-
.../taobao/weex/ui/SimpleComponentHolder.java | 6 +-
.../taobao/weex/ui/component/WXComponent.java | 4 +-
.../com/taobao/weex/ui/component/WXText.java | 17 +-
.../ui/component/list/BasicListComponent.java | 5 +
.../ui/component/list/GapItemDecoration.java | 71 ++++++++
.../weex/ui/component/list/WXListComponent.java | 34 ++++
.../list/template/WXRecyclerTemplateList.java | 18 +++
.../weex/ui/config/AutoScanConfigRegister.java | 112 +++++++++++++
.../weex/ui/config/ConfigComponentHolder.java | 161 +++++++++++++++++++
.../weex/ui/config/ConfigModuleFactory.java | 156 ++++++++++++++++++
.../taobao/weex/ui/module/WXLocaleModule.java | 4 -
.../com/taobao/weex/ui/view/WXEditText.java | 2 -
.../com/taobao/weex/ui/view/WXTextView.java | 42 +++++
.../taobao/weex/ui/view/gesture/WXGesture.java | 11 +-
26 files changed, 810 insertions(+), 41 deletions(-)
----------------------------------------------------------------------