weex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [48/50] incubator-weex git commit: Merge branch '0.15-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into ios-bugfix-input-0.15-dev
Date Mon, 24 Jul 2017 12:37:40 GMT
Merge branch '0.15-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into ios-bugfix-input-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/f35f97d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f35f97d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f35f97d8

Branch: refs/heads/0.16-dev
Commit: f35f97d8d3d2adad905871b5fc94156e957e4f51
Parents: 1b7c25b 9e488ad
Author: 齐山 <sunjjbobo@163.com>
Authored: Mon Jul 24 17:39:12 2017 +0800
Committer: 齐山 <sunjjbobo@163.com>
Committed: Mon Jul 24 17:39:12 2017 +0800

----------------------------------------------------------------------
 README.md                                       |  51 +-
 .../weex/extend/component/WXParallax.java       |   4 +-
 .../java/com/taobao/weex/dom/WXDomModule.java   |   1 -
 .../taobao/weex/dom/WXRecyclerDomObject.java    |   4 +
 .../ui/component/list/BasicListComponent.java   |  96 +--
 .../taobao/weex/ui/component/list/WXCell.java   |  10 -
 .../weex/ui/component/list/WXListComponent.java |   9 +-
 build/config.js                                 |   1 +
 build/karma.vue.conf.js                         |   7 +
 doc/source/cn/references/modules/timer.md       |   2 +-
 doc/source/references/modules/timer.md          |   3 +-
 html5/render/vue/modules/websocket/websocket.js |   1 +
 html5/render/vue/utils/event.js                 |   6 +-
 html5/render/vue/utils/func.js                  | 136 +++-
 html5/render/vue/utils/index.js                 | 104 ---
 html5/render/vue/utils/perf.js                  |   3 +-
 html5/test/render/vue/modules/websocket.js      |  90 +--
 html5/test/render/vue/utils/component.js        |  50 +-
 html5/test/render/vue/utils/event.js            |  78 +++
 html5/test/render/vue/utils/func.js             | 278 +++++++-
 html5/test/render/vue/utils/lazyload.js         | 106 +++
 html5/test/render/vue/utils/perf.js             | 132 ++++
 html5/test/render/vue/utils/style.js            | 157 ++++-
 html5/test/render/vue/utils/type.js             |  49 ++
 html5/test/render/vue/validator/index.js        |  31 +-
 .../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/WXJSCoreBridge.m |  19 +-
 .../Component/Recycler/WXRecyclerComponent.h    |   3 +-
 .../Component/Recycler/WXRecyclerComponent.m    |   5 +-
 .../Recycler/WXSectionDataController.h          |   2 +
 .../Sources/Component/WXCanvasComponent.h       |   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 +
 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 +
 pre-build/native-bundle-main.js                 |  16 +-
 66 files changed, 2428 insertions(+), 377 deletions(-)
----------------------------------------------------------------------



Mime
View raw message