Merge branch '0.15-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into wip-us-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/33a6becd Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/33a6becd Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/33a6becd Branch: refs/heads/0.15-dev Commit: 33a6becd52fa3950ab3ab47a9375973a0f00083b Parents: 9b02408 92a1616 Author: acton393 <zhangxing610...@gmail.com> Authored: Fri Jul 21 16:59:51 2017 +0800 Committer: acton393 <zhangxing610...@gmail.com> Committed: Fri Jul 21 16:59:51 2017 +0800 ---------------------------------------------------------------------- .../weex/extend/component/WXParallax.java | 4 +- .../java/com/taobao/weex/dom/WXDomModule.java | 1 - .../ui/component/list/BasicListComponent.java | 66 ++--- .../taobao/weex/ui/component/list/WXCell.java | 10 - 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 ++- pre-build/native-bundle-main.js | 16 +- 23 files changed, 1023 insertions(+), 308 deletions(-) ----------------------------------------------------------------------