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/b66b6263 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b66b6263 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b66b6263 Branch: refs/heads/0.15-dev Commit: b66b62637be4a3debb8ce1412e82a4f3f9532991 Parents: f0dd9d0 3bf348d Author: erha19 <faterr...@gmail.com> Authored: Mon Jul 17 17:54:49 2017 +0800 Committer: erha19 <faterr...@gmail.com> Committed: Mon Jul 17 17:54:49 2017 +0800 ---------------------------------------------------------------------- .../com/taobao/weex/CreateFinishListener.java | 27 +++ .../com/taobao/weex/UpdateFinishListener.java | 27 +++ .../java/com/taobao/weex/WXSDKInstance.java | 39 +++++ .../com/taobao/weex/dom/WXTextDomObject.java | 4 +- .../com/taobao/weex/ui/component/WXSlider.java | 28 +++ doc/source/cn/references/modules/timer.md | 47 +++++ doc/source/references/modules/timer.md | 59 +++++++ examples/vue/hello.vue | 2 +- .../vue/components/scrollable/list/index.js | 3 +- .../vue/components/scrollable/scroller.js | 3 +- .../vue/components/scrollable/waterfall.js | 3 +- .../render/vue/components/slider/slideMixin.js | 17 +- html5/render/vue/core/node.js | 172 ++++++++++++++----- html5/render/vue/env/wx-env.js | 2 +- html5/render/vue/mixins/base.js | 16 +- html5/render/vue/mixins/scrollable.js | 18 +- html5/render/vue/utils/style.js | 30 +++- html5/test/render/vue/core/node.js | 22 ++- .../WeexSDK/Sources/Bridge/WXBridgeContext.m | 33 ++-- .../WeexSDK/Sources/Component/WXAComponent.m | 2 +- .../Sources/Component/WXImageComponent.m | 4 +- .../WeexSDK/Sources/Component/WXListComponent.m | 55 ++++-- .../WeexSDK/Sources/Component/WXTextComponent.m | 54 +++--- .../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 | 2 +- ios/sdk/WeexSDK/Sources/Module/WXDomModule.m | 8 +- ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 2 +- .../Sources/Protocol/WXURLRewriteProtocol.h | 2 +- .../Sources/View/WXComponent+ViewManagement.m | 4 + package.json | 2 +- packages/weex-vue-render/package.json | 8 +- 35 files changed, 545 insertions(+), 160 deletions(-) ----------------------------------------------------------------------
