You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ac...@apache.org on 2017/08/10 09:08:17 UTC
[8/8] incubator-weex git commit: Merge branch '0.16-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex;
branch 'ios-arraybuffer-0.16-dev' of https://github.com/kfeagle/incubator-weex
into wip-us-0.16-dev
Merge branch '0.16-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex; branch 'ios-arraybuffer-0.16-dev' of https://github.com/kfeagle/incubator-weex into wip-us-0.16-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/e3776995
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e3776995
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e3776995
Branch: refs/heads/0.16-dev
Commit: e37769951ddd99d41862165bdf778a3b9b9d26e4
Parents: 5894ef6 0ccafb1
Author: acton393 <zh...@gmail.com>
Authored: Thu Aug 10 17:06:32 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Thu Aug 10 17:06:32 2017 +0800
----------------------------------------------------------------------
examples/vue/modules/websocket.vue | 22 +++++++++++++++++++-
.../WeexSDK/Sources/Loader/WXWebSocketLoader.h | 2 +-
.../WeexSDK/Sources/Loader/WXWebSocketLoader.m | 2 +-
ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 13 ++++++++++++
.../WeexSDK/Sources/Module/WXWebSocketModule.m | 16 ++++++++++++--
ios/sdk/WeexSDK/Sources/Utility/WXUtility.h | 12 +++++++++++
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 22 ++++++++++++++++++++
.../Sources/WebSocket/WXWebSocketDefaultImpl.m | 2 +-
8 files changed, 85 insertions(+), 6 deletions(-)
----------------------------------------------------------------------