You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2017/04/10 05:54:04 UTC
[14/15] incubator-weex git commit: Merge branch '0.12-dev' into
ios-feature-composite
Merge branch '0.12-dev' into ios-feature-composite
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c8c75a26
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c8c75a26
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c8c75a26
Branch: refs/heads/0.12-dev
Commit: c8c75a268433640d30ba23453398c3872bef298a
Parents: 99b83db 5b1126a
Author: \u9690\u5c0f\u98ce <cx...@gmail.com>
Authored: Mon Apr 10 11:53:06 2017 +0800
Committer: GitHub <no...@github.com>
Committed: Mon Apr 10 11:53:06 2017 +0800
----------------------------------------------------------------------
.../taobao/weex/ui/component/WXComponent.java | 23 ++-
.../taobao/weex/ui/view/gesture/WXGesture.java | 14 ++
.../Component/Recycler/WXRecyclerComponent.m | 1 +
.../WeexSDK/Sources/Component/WXListComponent.m | 2 +
.../Sources/Display/WXComponent+Display.m | 1 +
ios/sdk/WeexSDK/Sources/Model/WXComponent.h | 6 +
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 5 +
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 2 +-
ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 11 ++
ios/sdk/WeexSDK/Sources/Utility/WXType.h | 5 +
.../Sources/View/WXComponent+ViewManagement.m | 3 +
test/pages/components/recycler.vue | 29 ++--
test/scripts/components/recycler.test.js | 147 ++++++++++---------
13 files changed, 160 insertions(+), 89 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c8c75a26/ios/sdk/WeexSDK/Sources/Display/WXComponent+Display.m
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c8c75a26/ios/sdk/WeexSDK/Sources/Model/WXComponent.h
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c8c75a26/ios/sdk/WeexSDK/Sources/Model/WXComponent.m
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c8c75a26/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
----------------------------------------------------------------------
diff --cc ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
index 66985a9,83bcd7d..f7ef622
--- a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
+++ b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
@@@ -292,10 -292,8 +292,10 @@@ typedef enum : NSUInteger
}
[[WXSDKManager bridgeMgr] destroyInstance:self.instanceId];
-
+
- [self.componentManager invalidate];
+ if (_componentManager) {
+ [_componentManager invalidate];
+ }
__weak typeof(self) weakSelf = self;
WXPerformBlockOnComponentThread(^{
__strong typeof(self) strongSelf = weakSelf;
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c8c75a26/test/scripts/components/recycler.test.js
----------------------------------------------------------------------
diff --cc test/scripts/components/recycler.test.js
index bbf20a8,21e8f79..9850945
--- a/test/scripts/components/recycler.test.js
+++ b/test/scripts/components/recycler.test.js
@@@ -37,9 -37,11 +37,9 @@@ describe('recycler', function ()
const driver = util.createDriver(wd)
before(function () {
-
- console.log(util.getPage('/components/recycler.js'))
return util.init(driver)
.get(util.getPage('/components/recycler.js'))
- .waitForElementByXPath('//recycler[1]',util.getGETActionWaitTimeMills(),1000)
+ .waitForElementById('waterfall',util.getGETActionWaitTimeMills(),1000)
});
after(function () {