You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ta...@apache.org on 2017/07/28 09:12:07 UTC
[28/43] incubator-weex git commit: Merge branch '0.15-dev' into
0.15-dev-web
Merge branch '0.15-dev' into 0.15-dev-web
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ed20cdc2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ed20cdc2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ed20cdc2
Branch: refs/heads/0.16-dev
Commit: ed20cdc274515ff7a3334b76cf855856e12497e3
Parents: 5225997 7ca3a1e
Author: MrRaindrop <te...@gmail.com>
Authored: Tue Jul 25 15:50:54 2017 +0800
Committer: MrRaindrop <te...@gmail.com>
Committed: Tue Jul 25 15:50:54 2017 +0800
----------------------------------------------------------------------
README.md | 51 +-
.../weex/extend/component/WXParallax.java | 4 +-
.../taobao/weex/dom/WXRecyclerDomObject.java | 4 +
.../ui/component/list/BasicListComponent.java | 30 +-
.../weex/ui/component/list/WXListComponent.java | 9 +-
examples/vue/components/input.vue | 17 +
html5/test/render/vue/core/node.js | 10 +-
.../render/vue/data/dotvue/event-bubble-bar.vue | 11 -
.../render/vue/data/dotvue/event-bubble.vue | 11 -
.../WeexDemo.xcodeproj/project.pbxproj | 4 +
ios/playground/WeexDemo/WXDemoViewController.m | 3 +-
ios/sdk/WeexSDK-Dynamic/Info.plist | 24 +
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 638 ++++++++++++++++++-
.../xcschemes/WeexSDK-Dynamic.xcscheme | 80 +++
.../WeexSDK/Sources/Bridge/WXBridgeContext.h | 2 +-
.../WeexSDK/Sources/Bridge/WXBridgeContext.m | 19 +-
ios/sdk/WeexSDK/Sources/Bridge/WXBridgeMethod.m | 16 +-
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 19 +-
.../Component/Recycler/WXRecyclerComponent.h | 3 +-
.../Component/Recycler/WXRecyclerComponent.m | 5 +-
.../Recycler/WXSectionDataController.h | 2 +
.../Sources/Component/WXCanvasComponent.h | 2 +-
.../WeexSDK/Sources/Component/WXEditComponent.m | 2 +-
.../Sources/Component/WXFooterComponent.h | 2 +-
.../Sources/Component/WXHeaderComponent.h | 3 +-
.../Sources/Component/WXImageComponent.m | 1 +
.../WeexSDK/Sources/Component/WXListComponent.m | 2 +-
.../Sources/Component/WXScrollerComponent.m | 1 +
.../WeexSDK/Sources/Component/WXTextComponent.m | 1 +
.../Sources/Controller/WXRootViewController.m | 1 +
.../Sources/Display/WXComponent+BoxShadow.h | 4 -
ios/sdk/WeexSDK/Sources/Display/WXInnerLayer.h | 1 +
ios/sdk/WeexSDK/Sources/Display/WXRoundedRect.h | 2 +-
ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 10 +-
.../WeexSDK/Sources/Layout/WXComponent+Layout.m | 1 +
.../Sources/Manager/WXComponentManager.h | 3 +
.../Sources/Manager/WXComponentManager.m | 5 +-
.../WeexSDK/Sources/Manager/WXServiceFactory.h | 2 +-
.../WeexSDK/Sources/Manager/WXTracingManager.h | 125 ++++
.../WeexSDK/Sources/Manager/WXTracingManager.m | 382 +++++++++++
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 5 +-
.../WeexSDK/Sources/Model/WXJSExceptionInfo.h | 1 +
.../WeexSDK/Sources/Model/WXJSExceptionInfo.m | 1 +
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 7 +
.../WeexSDK/Sources/Module/WXAnimationModule.m | 7 +-
ios/sdk/WeexSDK/Sources/Module/WXDomModule.m | 4 +-
ios/sdk/WeexSDK/Sources/Module/WXPickerModule.m | 4 +-
ios/sdk/WeexSDK/Sources/Utility/WXLog.m | 1 +
.../View/WXComponent+PseudoClassManagement.h | 4 +-
.../Sources/View/WXComponent+ViewManagement.m | 3 +-
ios/sdk/WeexSDK/Sources/WeexSDK.h | 1 +
ios/sdk/buildScripts.sh | 2 +
52 files changed, 1444 insertions(+), 108 deletions(-)
----------------------------------------------------------------------