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/07/17 02:29:15 UTC
[2/2] incubator-weex git commit: Merge branch '0.15-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.15-dev
Merge branch '0.15-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex 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/d9f67fd7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d9f67fd7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d9f67fd7
Branch: refs/heads/0.15-dev
Commit: d9f67fd7499d9035677b4500a773ffdff91a55f3
Parents: 7e83d1f 59f54f9
Author: acton393 <zh...@gmail.com>
Authored: Fri Jul 14 17:48:35 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri Jul 14 17:48:35 2017 +0800
----------------------------------------------------------------------
.../vue/components/scrollable/list/index.js | 3 +-
.../vue/components/scrollable/scroller.js | 3 +-
.../vue/components/scrollable/waterfall.js | 3 +-
.../render/vue/components/slider/slideMixin.js | 17 +-
html5/render/vue/core/node.js | 172 ++++++++++++++-----
html5/render/vue/env/wx-env.js | 2 +-
html5/render/vue/mixins/base.js | 16 +-
html5/render/vue/mixins/scrollable.js | 18 +-
html5/render/vue/utils/style.js | 30 +++-
html5/test/render/vue/core/node.js | 22 ++-
package.json | 2 +-
packages/weex-vue-render/package.json | 8 +-
12 files changed, 215 insertions(+), 81 deletions(-)
----------------------------------------------------------------------