Merge branch '0.14-dev' of https://github.com/erha19/incubator-weex into 0.14-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/cbc2e2d8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/cbc2e2d8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/cbc2e2d8 Branch: refs/heads/master Commit: cbc2e2d89b5ecd4882968c9f4e1af252f122cdac Parents: 43adf40 96cf5de Author: MrRaindrop <tekk...@gmail.com> Authored: Mon Jun 26 17:13:24 2017 +0800 Committer: MrRaindrop <tekk...@gmail.com> Committed: Mon Jun 26 17:13:24 2017 +0800 ---------------------------------------------------------------------- examples/vue/index.vue | 1 + examples/vue/modules/websocket.vue | 116 +++++++++++++++++++ html5/render/vue/env/weex.js | 3 + html5/render/vue/modules/index.js | 2 + html5/render/vue/modules/websocket/index.js | 26 +++++ html5/render/vue/modules/websocket/websocket.js | 60 ++++++++++ html5/test/render/vue/modules/websocket.js | 11 ++ 7 files changed, 219 insertions(+) ----------------------------------------------------------------------