Merge branch '0.15-dev' of https://github.com/MrRaindrop/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/59f54f9c Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/59f54f9c Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/59f54f9c Branch: refs/heads/0.15-dev Commit: 59f54f9c710849543a7d9071f69bf1ce679b7e89 Parents: ba53cd4 5537878 Author: tancy <ron...@gmail.com> Authored: Fri Jul 14 17:39:44 2017 +0800 Committer: tancy <ron...@gmail.com> Committed: Fri Jul 14 17:39:44 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(-) ----------------------------------------------------------------------
