You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by zs...@apache.org on 2017/07/27 02:28:03 UTC
[3/4] incubator-weex git commit: Merge branch '0.15-dev' of
https://github.com/apache/incubator-weex into 0.15-dev
Merge branch '0.15-dev' of https://github.com/apache/incubator-weex into 0.15-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/0bf8ebe6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0bf8ebe6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0bf8ebe6
Branch: refs/heads/0.15-dev
Commit: 0bf8ebe6b6078187971553dffe7a501d0f650405
Parents: b911649 ee9b1c7
Author: miomin <69...@qq.com>
Authored: Wed Jul 26 16:37:14 2017 +0800
Committer: miomin <69...@qq.com>
Committed: Wed Jul 26 16:37:14 2017 +0800
----------------------------------------------------------------------
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 | 2 +-
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 8 +
.../WeexSDK/Sources/Bridge/WXBridgeContext.m | 34 +-
ios/sdk/WeexSDK/Sources/Bridge/WXBridgeMethod.m | 16 +-
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 33 +-
.../WeexSDK/Sources/Component/WXEditComponent.m | 2 +-
.../Sources/Component/WXImageComponent.m | 1 +
.../Sources/Component/WXScrollerComponent.m | 1 +
.../WeexSDK/Sources/Component/WXTextComponent.m | 1 +
.../Sources/Manager/WXComponentManager.m | 5 +-
.../WeexSDK/Sources/Manager/WXTracingManager.h | 126 ++++++
.../WeexSDK/Sources/Manager/WXTracingManager.m | 384 +++++++++++++++++++
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 3 +
.../WeexSDK/Sources/Model/WXJSExceptionInfo.h | 1 +
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 7 +
.../WeexSDK/Sources/Module/WXAnimationModule.m | 7 +-
ios/sdk/WeexSDK/Sources/Module/WXDomModule.m | 4 +-
.../WeexSDK/Sources/Protocol/WXBridgeProtocol.h | 5 +
ios/sdk/WeexSDK/Sources/Utility/WXLog.m | 8 +
.../Sources/View/WXComponent+ViewManagement.m | 3 +-
ios/sdk/WeexSDK/Sources/WeexSDK.h | 1 +
pre-build/native-bundle-main.js | 12 +-
27 files changed, 660 insertions(+), 57 deletions(-)
----------------------------------------------------------------------