You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by zs...@apache.org on 2017/08/01 02:29:23 UTC
[14/50] [abbrv] incubator-weex git commit: Merge branch '0.14-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into
ios-bugfix-mamaca-0.14-dev-0624
Merge branch '0.14-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into ios-bugfix-mamaca-0.14-dev-0624
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/cfe4659a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/cfe4659a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/cfe4659a
Branch: refs/heads/master
Commit: cfe4659af6fe7fe7c64903329b80ebf1bda504b3
Parents: 24474e2 cbc2e2d
Author: 齐山 <su...@163.com>
Authored: Tue Jun 27 14:01:05 2017 +0800
Committer: 齐山 <su...@163.com>
Committed: Tue Jun 27 14:01:05 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 ++
.../Sources/Component/WXCycleSliderComponent.m | 7 ++
8 files changed, 226 insertions(+)
----------------------------------------------------------------------