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/22 05:27:40 UTC
[35/50] [abbrv] incubator-weex git commit: Merge branch '0.14-dev' of
github.com:MrRaindrop/incubator-weex into 0.14-dev
Merge branch '0.14-dev' of github.com:MrRaindrop/incubator-weex into 0.14-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/b006e16c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b006e16c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b006e16c
Branch: refs/heads/dev
Commit: b006e16c764917d4f593f824f78501874f1a0438
Parents: 87b19c2 569d333
Author: sospartan <so...@apache.org>
Authored: Fri Jun 16 12:04:58 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Fri Jun 16 12:04:58 2017 +0800
----------------------------------------------------------------------
examples/vue/components/waterfall.vue | 165 +++++----
html5/render/vue/components/index.js | 3 +
.../render/vue/components/scrollable/header.js | 2 +-
.../vue/components/scrollable/list/index.js | 10 -
.../vue/components/scrollable/scroller.js | 15 -
.../vue/components/scrollable/waterfall.js | 338 +++++++++++++++++++
html5/render/vue/components/slider/indicator.js | 8 +-
.../render/vue/components/slider/slideMixin.js | 15 +-
html5/render/vue/config.js | 21 ++
html5/render/vue/core/style.js | 103 ++++--
html5/render/vue/env/wx-env.js | 12 +-
html5/render/vue/index.js | 3 +-
html5/render/vue/mixins/base.js | 15 +-
html5/render/vue/mixins/index.js | 4 +-
html5/render/vue/mixins/scrollable.js | 87 ++++-
html5/render/vue/mixins/sticky.js | 65 ++++
html5/render/vue/modules/dom.js | 18 +-
html5/render/vue/modules/globalEvent.js | 69 ++++
html5/render/vue/modules/index.js | 2 +
html5/render/vue/styles/base.css | 30 +-
html5/render/vue/styles/reset.css | 5 +
html5/render/vue/utils/component.js | 187 +++++++---
package.json | 2 +-
packages/weex-vue-render/README.md | 19 +-
packages/weex-vue-render/package.json | 2 +-
25 files changed, 959 insertions(+), 241 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b006e16c/package.json
----------------------------------------------------------------------