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 2017/09/26 09:02:42 UTC
[1/5] incubator-weex git commit: * [ios] change import inner file
header method
Repository: incubator-weex
Updated Branches:
refs/heads/master c5d10645f -> c6d5ce57c
* [ios] change import inner file header method
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/1ee3bd65
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1ee3bd65
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1ee3bd65
Branch: refs/heads/master
Commit: 1ee3bd6593eb5a5e1978fba517f202f529854425
Parents: 915935b
Author: acton393 <zh...@gmail.com>
Authored: Tue Sep 26 16:17:04 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Tue Sep 26 16:17:04 2017 +0800
----------------------------------------------------------------------
.../Sources/Component/RecycleList/WXComponent+DataBinding.h | 2 +-
.../Sources/Component/RecycleList/WXComponent+DataBinding.mm | 2 ++
ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.m | 6 +++---
ios/sdk/WeexSDK/Sources/Module/WXNavigatorModule.h | 3 ++-
ios/sdk/WeexSDKTests/WXStreamModuleTests.m | 2 +-
5 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1ee3bd65/ios/sdk/WeexSDK/Sources/Component/RecycleList/WXComponent+DataBinding.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/RecycleList/WXComponent+DataBinding.h b/ios/sdk/WeexSDK/Sources/Component/RecycleList/WXComponent+DataBinding.h
index 610f82f..971252a 100644
--- a/ios/sdk/WeexSDK/Sources/Component/RecycleList/WXComponent+DataBinding.h
+++ b/ios/sdk/WeexSDK/Sources/Component/RecycleList/WXComponent+DataBinding.h
@@ -17,7 +17,7 @@
* under the License.
*/
-#import <WeexSDK/WeexSDK.h>
+#import "WXComponent.h"
static const NSString *WXBindingIdentify = @"@binding";
static const NSString *WXBindingMatchIdentify = @"[[match]]";
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1ee3bd65/ios/sdk/WeexSDK/Sources/Component/RecycleList/WXComponent+DataBinding.mm
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/RecycleList/WXComponent+DataBinding.mm b/ios/sdk/WeexSDK/Sources/Component/RecycleList/WXComponent+DataBinding.mm
index 0b73721..aad49da 100644
--- a/ios/sdk/WeexSDK/Sources/Component/RecycleList/WXComponent+DataBinding.mm
+++ b/ios/sdk/WeexSDK/Sources/Component/RecycleList/WXComponent+DataBinding.mm
@@ -24,6 +24,8 @@
#import "WXAssert.h"
#import "WXJSASTParser.h"
+#import <JavaScriptCore/JavaScriptCore.h>
+
#pragma clang diagnostic ignored "-Wobjc-protocol-method-implementation"
typedef enum : NSUInteger {
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1ee3bd65/ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.m b/ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.m
index 17b46a0..59e2fa7 100644
--- a/ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.m
+++ b/ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.m
@@ -21,9 +21,9 @@
#import "WXComponentFactory.h"
#import "WXModuleFactory.h"
#import "WXSDKManager.h"
-#import <WeexSDK/WXComponentFactory.h>
-#import <WeexSDK/WXModuleFactory.h>
-#import <WeexSDK/WXHandlerFactory.h>
+#import "WXComponentFactory.h"
+#import "WXModuleFactory.h"
+#import "WXHandlerFactory.h"
#import "WXUtility.h"
#import "WXComponentManager.h"
#import "WXTracingProtocol.h"
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1ee3bd65/ios/sdk/WeexSDK/Sources/Module/WXNavigatorModule.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Module/WXNavigatorModule.h b/ios/sdk/WeexSDK/Sources/Module/WXNavigatorModule.h
index 614ad66..bed001e 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXNavigatorModule.h
+++ b/ios/sdk/WeexSDK/Sources/Module/WXNavigatorModule.h
@@ -18,7 +18,8 @@
*/
#import <Foundation/Foundation.h>
-#import <WeexSDK/WXModuleProtocol.h>
+
+#import "WXModuleProtocol.h"
@interface WXNavigatorModule : NSObject <WXModuleProtocol>
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1ee3bd65/ios/sdk/WeexSDKTests/WXStreamModuleTests.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDKTests/WXStreamModuleTests.m b/ios/sdk/WeexSDKTests/WXStreamModuleTests.m
index 243e827..6c6dada 100644
--- a/ios/sdk/WeexSDKTests/WXStreamModuleTests.m
+++ b/ios/sdk/WeexSDKTests/WXStreamModuleTests.m
@@ -19,7 +19,7 @@
#import <XCTest/XCTest.h>
#import "WXStreamModule.h"
-#import <WeexSDK/WeexSDK.h>
+#import "WeexSDK.h"
#import "WXResourceRequestHandlerDefaultImpl.h"
@interface WXStreamModuleTests : XCTestCase
[3/5] incubator-weex git commit: * [ios] never adjust contentInset in
recyleList view
Posted by ac...@apache.org.
* [ios] never adjust contentInset in recyleList view
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/55f18b1c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/55f18b1c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/55f18b1c
Branch: refs/heads/master
Commit: 55f18b1c776ca96d13f301bbd1bf240779abbaba
Parents: 8a088df
Author: acton393 <zh...@gmail.com>
Authored: Tue Sep 26 16:52:15 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Tue Sep 26 16:52:15 2017 +0800
----------------------------------------------------------------------
.../Sources/Component/RecycleList/WXRecycleListComponent.m | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/55f18b1c/ios/sdk/WeexSDK/Sources/Component/RecycleList/WXRecycleListComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/RecycleList/WXRecycleListComponent.m b/ios/sdk/WeexSDK/Sources/Component/RecycleList/WXRecycleListComponent.m
index 71a52f5..b434f6d 100644
--- a/ios/sdk/WeexSDK/Sources/Component/RecycleList/WXRecycleListComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/RecycleList/WXRecycleListComponent.m
@@ -101,6 +101,9 @@ WX_EXPORT_METHOD(@selector(scrollTo:options:))
_collectionView.allowsMultipleSelection = NO;
_collectionView.dataSource = self;
_collectionView.delegate = self;
+#ifdef __IPHONE_11_0
+ _collectionView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+#endif
_templateManager.collectionView = _collectionView;
_updateManager.collectionView = _collectionView;
[4/5] incubator-weex git commit: * [ios] never auto adjust water fall
component contentInset
Posted by ac...@apache.org.
* [ios] never auto adjust water fall component contentInset
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c76b9385
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c76b9385
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c76b9385
Branch: refs/heads/master
Commit: c76b93859e5409459625addf5bab0fe8a0bd50f1
Parents: 55f18b1
Author: acton393 <zh...@gmail.com>
Authored: Tue Sep 26 17:00:04 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Tue Sep 26 17:00:04 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c76b9385/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m b/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m
index 1164472..b8ae634 100644
--- a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m
@@ -173,6 +173,9 @@ typedef enum : NSUInteger {
_dragController.dragingCell = [[WXCollectionViewCell alloc] initWithFrame:CGRectMake(0, 0, 100, 100/2.0f)];
_dragController.collectionView = _collectionView;
+#ifdef __IPHONE_11_0
+ _collectionView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+#endif
[self performUpdatesWithCompletion:^(BOOL finished) {
[5/5] incubator-weex git commit: Merge branches 'master' and
'0.16-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into
wip-us-master
Posted by ac...@apache.org.
Merge branches 'master' and '0.16-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into wip-us-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/c6d5ce57
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c6d5ce57
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c6d5ce57
Branch: refs/heads/master
Commit: c6d5ce57cfe8082152e4c22473ec080f1c4fa933
Parents: c5d1064 c76b938
Author: acton393 <zh...@gmail.com>
Authored: Tue Sep 26 17:02:11 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Tue Sep 26 17:02:11 2017 +0800
----------------------------------------------------------------------
.../Sources/Component/RecycleList/WXComponent+DataBinding.h | 2 +-
.../Sources/Component/RecycleList/WXComponent+DataBinding.mm | 2 ++
.../Sources/Component/RecycleList/WXRecycleListComponent.m | 3 +++
.../WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m | 3 +++
ios/sdk/WeexSDK/Sources/Component/WXListComponent.m | 3 +++
ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m | 3 +++
ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.m | 6 +++---
ios/sdk/WeexSDK/Sources/Module/WXNavigatorModule.h | 3 ++-
ios/sdk/WeexSDKTests/WXStreamModuleTests.m | 2 +-
9 files changed, 21 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[2/5] incubator-weex git commit: * [ios] set never adjust scrollview
contentInset
Posted by ac...@apache.org.
* [ios] set never adjust scrollview contentInset
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8a088dfb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8a088dfb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8a088dfb
Branch: refs/heads/master
Commit: 8a088dfb48643e17bfaef01da25f9229c2ce26be
Parents: 1ee3bd6
Author: acton393 <zh...@gmail.com>
Authored: Tue Sep 26 16:46:23 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Tue Sep 26 16:46:23 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXListComponent.m | 3 +++
ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m | 3 +++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8a088dfb/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
index cb9237f..74516fa 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXListComponent.m
@@ -155,6 +155,9 @@
_tableView.delegate = self;
_tableView.dataSource = self;
_tableView.userInteractionEnabled = YES;
+#ifdef __IPHONE_11_0
+ _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+#endif
}
- (void)viewWillUnload
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8a088dfb/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 306631b..8ef35e4 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
@@ -146,6 +146,9 @@ WX_EXPORT_METHOD(@selector(resetLoadmore))
scrollView.showsHorizontalScrollIndicator = _showScrollBar;
scrollView.scrollEnabled = _scrollable;
scrollView.pagingEnabled = _pagingEnabled;
+#ifdef __IPHONE_11_0
+ scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+#endif
if (self.ancestorScroller) {
scrollView.scrollsToTop = NO;