Merge branch '0.14-dev' of https://github.com/MrRaindrop/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/bc7ef1d1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/bc7ef1d1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/bc7ef1d1 Branch: refs/heads/0.14-dev Commit: bc7ef1d1ecea399ea5b7e0b1c848284e2e3e24df Parents: 5191cc3 d20e0d8 Author: tancy <ron...@gmail.com> Authored: Fri Jun 30 11:24:50 2017 +0800 Committer: tancy <ron...@gmail.com> Committed: Fri Jun 30 11:24:50 2017 +0800 ---------------------------------------------------------------------- build/webpack.examples.web.config.js | 1 + build/webpack.test.web.config.js | 1 + html5/render/vue/core/style.js | 27 ++++++---- html5/render/vue/env/global.js | 2 + html5/render/vue/env/weex.js | 3 ++ html5/render/vue/mixins/style.js | 58 +++++++++++++++++++--- html5/test/render/vue/core/scope-style-map.js | 4 ++ package.json | 4 +- packages/weex-vue-render/package.json | 2 +- 9 files changed, 81 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bc7ef1d1/html5/render/vue/env/weex.js ----------------------------------------------------------------------