You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/06/07 08:06:25 UTC

[48/50] incubator-weex git commit: Merge branch '0.13-dev' of https://github.com/MrRaindrop/incubator-weex into 0.13-dev

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

Branch: refs/heads/dev
Commit: 404f3cc149836932011c082c32552aafc51d5c3b
Parents: d2f4cfe 8b2ee21
Author: tancy <ro...@gmail.com>
Authored: Sun Jun 4 14:04:42 2017 +0800
Committer: tancy <ro...@gmail.com>
Committed: Sun Jun 4 14:04:42 2017 +0800

----------------------------------------------------------------------
 html5/render/vue/README.md                      |  23 +-
 html5/render/vue/components/slider/index.js     | 137 +---
 .../render/vue/components/slider/slideMixin.js  | 647 ++++++++++++++-----
 .../vue/components/slider/slider-neighbor.css   |  19 -
 .../vue/components/slider/slider-neighbor.js    | 116 +---
 html5/render/vue/components/slider/slider.css   |  34 +
 html5/render/vue/core/style.js                  |   7 +-
 html5/render/vue/env/viewport.js                |   6 +-
 html5/render/vue/index.js                       |   6 +
 html5/render/vue/mixins/scrollable.js           |   7 +-
 html5/render/vue/modules/dom.js                 |  16 +-
 html5/render/vue/utils/style.js                 |  85 ++-
 package.json                                    |   2 +-
 packages/weex-vue-render/README.md              |  23 +-
 packages/weex-vue-render/package.json           |   2 +-
 15 files changed, 685 insertions(+), 445 deletions(-)
----------------------------------------------------------------------