Merge branch '0.15-dev' of https://github.com/erha19/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/9764e25e Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9764e25e Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9764e25e Branch: refs/heads/0.15-dev Commit: 9764e25ea1d8abdd803f6b2547f268d470d91ee0 Parents: 831cb26 2211546 Author: MrRaindrop <tekk...@gmail.com> Authored: Thu Jul 20 16:28:44 2017 +0800 Committer: MrRaindrop <tekk...@gmail.com> Committed: Thu Jul 20 16:28:44 2017 +0800 ---------------------------------------------------------------------- build/config.js | 1 + build/karma.vue.conf.js | 7 + 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 ++- 16 files changed, 981 insertions(+), 248 deletions(-) ----------------------------------------------------------------------
