Merge branch '0.15-dev' into 0.15-dev-web
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/69365b3b Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/69365b3b Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/69365b3b Branch: refs/heads/0.16-dev Commit: 69365b3b41df8ea3c3b2a6504980dbefa431a938 Parents: 34f9f59 cc9ca19 Author: MrRaindrop <tekk...@gmail.com> Authored: Mon Jul 3 17:40:21 2017 +0800 Committer: MrRaindrop <tekk...@gmail.com> Committed: Mon Jul 3 17:40:21 2017 +0800 ---------------------------------------------------------------------- .../java/com/taobao/weex/WXEnvironment.java | 4 + .../com/taobao/weex/bridge/WXBridgeManager.java | 12 +- .../java/com/taobao/weex/common/WXConfig.java | 1 + .../taobao/weex/ui/component/WXComponent.java | 8 + .../ui/component/list/BasicListComponent.java | 57 +++-- .../taobao/weex/ui/component/list/WXCell.java | 9 + build/karma.vue.conf.js | 9 +- doc/source/cn/references/weex-variable.md | 1 + doc/source/references/weex-variable.md | 1 + html5/render/vue/core/style.js | 1 - html5/render/vue/modules/websocket/websocket.js | 1 + html5/test/render/vue/helper/utils.js | 10 +- html5/test/render/vue/modules/modal.js | 225 +++++++++++++++++++ html5/test/render/vue/modules/websocket.js | 109 ++++++++- ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 2 +- .../WeexSDK/Sources/Component/WXTextComponent.m | 16 ++ ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 1 + package.json | 2 +- 18 files changed, 432 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/69365b3b/package.json ----------------------------------------------------------------------
