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:05 UTC
[15/15] incubator-weex git commit: Merge branch
'ios-feature-composite' of https://github.com/cxfeng1/incubator-weex into
0.12-dev
Merge branch 'ios-feature-composite' of https://github.com/cxfeng1/incubator-weex into 0.12-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/219cd30a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/219cd30a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/219cd30a
Branch: refs/heads/0.12-dev
Commit: 219cd30a5e92e645c66d3dbc8e0b91fb6b00614e
Parents: 68b2b57 c8c75a2
Author: cxfeng <cx...@apache.org>
Authored: Mon Apr 10 13:53:35 2017 +0800
Committer: cxfeng <cx...@apache.org>
Committed: Mon Apr 10 13:53:35 2017 +0800
----------------------------------------------------------------------
examples/vue/index.vue | 10 +-
examples/vue/showcase/compositing.vue | 89 ++++++++
.../WeexSDK/Sources/Component/WXCellComponent.m | 10 +-
.../Sources/Component/WXComponent_internal.h | 8 +-
.../Sources/Component/WXImageComponent.m | 90 +++++---
.../WeexSDK/Sources/Component/WXTextComponent.m | 134 ++++--------
.../Sources/Display/WXComponent+Display.m | 218 +++++++++++++------
ios/sdk/WeexSDK/Sources/Display/WXRoundedRect.h | 4 +
.../WeexSDK/Sources/Display/WXRoundedRect.mm | 10 +
ios/sdk/WeexSDK/Sources/Model/WXComponent.h | 68 +++++-
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 7 +-
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 4 +-
test/scripts/components/recycler.test.js | 2 -
13 files changed, 434 insertions(+), 220 deletions(-)
----------------------------------------------------------------------