You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by da...@apache.org on 2017/06/30 08:49:12 UTC
[7/7] incubator-weex git commit: Merge branch '0.14-dev' into 0.15-dev
Merge branch '0.14-dev' into 0.15-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/37191366
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/37191366
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/37191366
Branch: refs/heads/0.15-dev
Commit: 37191366a61c242c3a57c2a9fffbe0f549795074
Parents: 55ba496 bc7ef1d
Author: MrRaindrop <te...@gmail.com>
Authored: Fri Jun 30 16:48:51 2017 +0800
Committer: MrRaindrop <te...@gmail.com>
Committed: Fri Jun 30 16:48:51 2017 +0800
----------------------------------------------------------------------
.../taobao/weex/ui/component/WXComponent.java | 4 +-
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 +-
10 files changed, 84 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/37191366/package.json
----------------------------------------------------------------------