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/08/01 02:54:57 UTC

[30/50] [abbrv] incubator-weex git commit: Merge branch '0.15-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.15-dev

Merge branch '0.15-dev' of https://git-wip-us.apache.org/repos/asf/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/7ca3a1e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7ca3a1e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7ca3a1e3

Branch: refs/heads/dev
Commit: 7ca3a1e379b0fea464b665f2deb292ee8b12bd5b
Parents: 50329bb f35f97d
Author: MrRaindrop <te...@gmail.com>
Authored: Mon Jul 24 17:58:28 2017 +0800
Committer: MrRaindrop <te...@gmail.com>
Committed: Mon Jul 24 17:58:28 2017 +0800

----------------------------------------------------------------------
 .../weex/ui/component/list/WXListComponent.java |   7 +-
 examples/vue/components/input.vue               |  17 +
 .../WeexDemo.xcodeproj/project.pbxproj          |   4 +
 ios/playground/WeexDemo/WXDemoViewController.m  |   3 +-
 ios/sdk/WeexSDK.xcodeproj/project.pbxproj       |   8 +
 .../WeexSDK/Sources/Bridge/WXBridgeContext.m    |  12 +-
 ios/sdk/WeexSDK/Sources/Bridge/WXBridgeMethod.m |  16 +-
 ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m |  19 +-
 .../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        |   4 +-
 .../WeexSDK/Sources/Manager/WXTracingManager.h  | 125 ++++++
 .../WeexSDK/Sources/Manager/WXTracingManager.m  | 382 +++++++++++++++++++
 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 +-
 ios/sdk/WeexSDK/Sources/Utility/WXLog.m         |   1 +
 .../Sources/View/WXComponent+ViewManagement.m   |   3 +-
 ios/sdk/WeexSDK/Sources/WeexSDK.h               |   1 +
 23 files changed, 602 insertions(+), 27 deletions(-)
----------------------------------------------------------------------