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/08/03 13:43:48 UTC

[12/12] incubator-weex git commit: Merge branch '0.16-dev' of https://github.com/erha19/incubator-weex into 0.16-dev

Merge branch '0.16-dev' of https://github.com/erha19/incubator-weex into 0.16-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/cf40471e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/cf40471e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/cf40471e

Branch: refs/heads/0.16-dev
Commit: cf40471e6bfe5242f98f0058c7a8e6beb4c537e3
Parents: ec4317d 6be9c36
Author: MrRaindrop <te...@gmail.com>
Authored: Thu Aug 3 21:41:16 2017 +0800
Committer: MrRaindrop <te...@gmail.com>
Committed: Thu Aug 3 21:41:16 2017 +0800

----------------------------------------------------------------------
 build/karma.vue.conf.js                         |   2 +-
 examples/vue/components/scroller.vue            |   9 +-
 examples/vue/modules/picker.vue                 | 149 ++++++++-----------
 .../vue/components/scrollable/scroller.js       |   8 +-
 .../render/vue/components/scrollable/style.css  |   5 +
 html5/render/vue/modules/dom.js                 |  97 ++++++------
 html5/test/render/vue/modules/dom.js            |  17 ++-
 package.json                                    |   1 +
 vue.html                                        |   3 +
 9 files changed, 144 insertions(+), 147 deletions(-)
----------------------------------------------------------------------