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/194a57d9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/194a57d9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/194a57d9 Branch: refs/heads/0.16-dev Commit: 194a57d98b5462289b7a7329a3f59af84b27a6af Parents: eb5dcb8 9764e25 Author: MrRaindrop <tekk...@gmail.com> Authored: Thu Jul 20 16:29:52 2017 +0800 Committer: MrRaindrop <tekk...@gmail.com> Committed: Thu Jul 20 16:29:52 2017 +0800 ---------------------------------------------------------------------- .../java/com/taobao/weex/dom/WXDomModule.java | 1 - .../com/taobao/weex/dom/WXTextDomObject.java | 4 +- .../com/taobao/weex/dom/action/Actions.java | 4 +- .../taobao/weex/ui/component/WXScroller.java | 79 +++--- .../com/taobao/weex/ui/component/WXSlider.java | 10 +- .../ui/component/list/BasicListComponent.java | 66 ++--- .../taobao/weex/ui/component/list/WXCell.java | 10 - .../weex/ui/view/WXHorizontalScrollView.java | 27 ++ .../com/taobao/weex/ui/view/WXScrollView.java | 1 - build/config.js | 1 + build/karma.vue.conf.js | 7 + doc/source/cn/references/modules/meta.md | 96 +++++++ doc/source/cn/references/modules/timer.md | 47 ++++ doc/source/references/modules/meta.md | 97 +++++++ doc/source/references/modules/timer.md | 58 ++++ examples/vue/hello.vue | 2 +- 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 ++- .../WeexSDK/Sources/Bridge/WXBridgeContext.m | 33 +-- .../WeexSDK/Sources/Component/WXAComponent.m | 2 +- .../Sources/Component/WXCycleSliderComponent.m | 6 + .../WeexSDK/Sources/Component/WXEditComponent.m | 2 +- .../Sources/Component/WXImageComponent.m | 4 +- .../WeexSDK/Sources/Component/WXListComponent.m | 55 +++- .../WeexSDK/Sources/Component/WXTextComponent.m | 54 ++-- ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 24 +- .../Sources/Component/WXVideoComponent.m | 2 +- .../WeexSDK/Sources/Component/WXWebComponent.m | 2 +- .../Sources/Handler/WXURLRewriteDefaultImpl.m | 2 +- .../WeexSDK/Sources/Layout/WXComponent+Layout.m | 2 +- ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m | 2 +- ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 6 +- .../WeexSDK/Sources/Module/WXAnimationModule.m | 14 +- ios/sdk/WeexSDK/Sources/Module/WXDomModule.m | 8 +- ios/sdk/WeexSDK/Sources/Module/WXPickerModule.m | 7 + ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 2 +- .../Sources/Protocol/WXURLRewriteProtocol.h | 2 +- .../Sources/View/WXComponent+ViewManagement.m | 4 + ios/sdk/WeexSDKTests/WXAnimationModuleTests.m | 29 ++ pre-build/native-bundle-main.js | 16 +- 52 files changed, 1570 insertions(+), 439 deletions(-) ----------------------------------------------------------------------
