You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by fk...@apache.org on 2017/04/12 08:27:53 UTC
[10/17] incubator-weex git commit: Merge branch '0.11-dev' into
dev-web-scale
Merge branch '0.11-dev' into dev-web-scale
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e49dad6b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e49dad6b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e49dad6b
Branch: refs/heads/0.11-dev
Commit: e49dad6b6b2511bddc86efd6390d252919e8f898
Parents: 501c85f 9afe27b
Author: MrRaindrop <te...@gmail.com>
Authored: Sun Apr 9 17:58:20 2017 +0800
Committer: MrRaindrop <te...@gmail.com>
Committed: Sun Apr 9 17:58:20 2017 +0800
----------------------------------------------------------------------
.../com/taobao/weex/ui/component/WXImage.java | 6 +++
examples/vue/components/sliderinfinite.vue | 46 ++++++++++++++++++++
html5/render/vue/components/slider/index.js | 6 ++-
.../render/vue/components/slider/slideMixin.js | 24 +++++++++-
html5/render/vue/modules/dom.js | 4 ++
package.json | 1 +
vue.html | 11 +++--
7 files changed, 89 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e49dad6b/html5/render/vue/components/slider/index.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e49dad6b/html5/render/vue/modules/dom.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e49dad6b/package.json
----------------------------------------------------------------------