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/04/13 02:32:12 UTC
[18/23] incubator-weex git commit: Merge branch '0.11-dev' of
https://github.com/MrRaindrop/incubator-weex into 0.11-dev
Merge branch '0.11-dev' of https://github.com/MrRaindrop/incubator-weex into 0.11-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/bbb120d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/bbb120d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/bbb120d8
Branch: refs/heads/0.12-dev
Commit: bbb120d83a795e0f22735bc38b9d59152ae0bd35
Parents: 8174a3f d442601
Author: matianyi <za...@zaoxian.local>
Authored: Wed Apr 12 16:27:07 2017 +0800
Committer: matianyi <za...@zaoxian.local>
Committed: Wed Apr 12 16:27:07 2017 +0800
----------------------------------------------------------------------
.eslintignore | 1 +
.gitignore | 2 +-
NOTICE | 8 +-
build/karma.vue.conf.js | 7 +-
build/webpack.examples.web.config.js | 31 +-
build/webpack.test.web.config.js | 81 +++
examples/vue/showcase/itemlist.vue | 11 +-
examples/vue/style/index.vue | 2 +-
.../npm/karma-rollup-preprocessor_vx.x.x.js | 53 ++
flow-typed/npm/karma-sinon-chai_vx.x.x.js | 38 ++
html5/render/vue/README.md | 24 +-
html5/render/vue/components/a.js | 17 +-
html5/render/vue/components/div.js | 17 +-
html5/render/vue/components/image.js | 25 +-
html5/render/vue/components/input.js | 18 +-
.../render/vue/components/scrollable/header.js | 6 +-
.../vue/components/scrollable/list/cell.js | 6 +-
.../vue/components/scrollable/list/index.js | 6 +-
.../vue/components/scrollable/list/style.js | 16 +
.../components/scrollable/loading-indicator.js | 43 +-
.../render/vue/components/scrollable/loading.js | 6 +-
.../render/vue/components/scrollable/refresh.js | 6 +-
.../vue/components/scrollable/scroller.js | 8 +-
html5/render/vue/components/slider/index.js | 36 +-
html5/render/vue/components/slider/indicator.js | 58 +-
html5/render/vue/components/switch.js | 66 ++-
html5/render/vue/components/text.js | 27 +-
html5/render/vue/components/textarea.js | 19 +-
html5/render/vue/components/video.js | 6 +-
html5/render/vue/components/web.js | 19 +-
html5/render/vue/core/index.js | 2 +
html5/render/vue/core/node.js | 28 +
html5/render/vue/core/style.js | 212 ++++++++
html5/render/vue/env/global.js | 11 +
html5/render/vue/env/index.js | 11 +-
html5/render/vue/env/viewport.js | 162 ++++--
html5/render/vue/env/weex.js | 9 +-
html5/render/vue/env/wx-env.js | 80 +--
html5/render/vue/index.js | 13 +-
html5/render/vue/mixins/base.js | 43 --
html5/render/vue/mixins/style.js | 142 +----
html5/render/vue/modules/animation.js | 7 +-
html5/render/vue/modules/dom.js | 5 +-
html5/render/vue/modules/index.js | 2 +-
html5/render/vue/modules/modal/index.js | 10 +-
html5/render/vue/modules/modal/style.js | 146 ++++++
html5/render/vue/styles/base.css | 194 +++++++
html5/render/vue/styles/components.css | 513 ------------------
html5/render/vue/utils/index.js | 36 +-
html5/render/vue/utils/style.js | 110 ++++
html5/test/render/vue/components/image.js | 4 +-
html5/test/render/vue/components/switch.js | 4 -
html5/test/render/vue/components/text.js | 4 -
html5/test/render/vue/components/web.js | 4 -
html5/test/render/vue/core/scope-style-map.js | 76 +++
html5/test/render/vue/core/style.js | 65 +++
.../vue/data/build/dotvue/scoped-style.js | 525 +++++++++++++++++++
html5/test/render/vue/data/css/head1.css | 38 ++
html5/test/render/vue/data/css/head10.css | 14 +
html5/test/render/vue/data/css/head11.css | 2 +
html5/test/render/vue/data/css/head12.css | 2 +
html5/test/render/vue/data/css/head13.css | 25 +
html5/test/render/vue/data/css/head2.css | 11 +
html5/test/render/vue/data/css/head3.css | 25 +
html5/test/render/vue/data/css/head4.css | 56 ++
html5/test/render/vue/data/css/head5.css | 153 ++++++
html5/test/render/vue/data/css/head6.css | 4 +
html5/test/render/vue/data/css/head7.css | 61 +++
html5/test/render/vue/data/css/head8.css | 507 ++++++++++++++++++
html5/test/render/vue/data/css/head9.css | 173 ++++++
.../render/vue/data/dotvue/scoped-style.vue | 13 +
html5/test/render/vue/data/head-css.js | 13 +
html5/test/render/vue/data/head-map.js | 275 ++++++++++
html5/test/render/vue/helper.js | 140 -----
html5/test/render/vue/helper/env.js | 20 +
html5/test/render/vue/helper/index.js | 73 +++
html5/test/render/vue/helper/runtime.js | 74 +++
html5/test/render/vue/helper/utils.js | 8 +
html5/test/render/vue/utils.js | 47 --
html5/test/render/vue/utils/func.js | 49 ++
html5/test/render/vue/utils/style.js | 68 +++
package.json | 4 +-
packages/weex-vue-render/README.md | 24 +-
packages/weex-vue-render/package.json | 2 +-
84 files changed, 3818 insertions(+), 1144 deletions(-)
----------------------------------------------------------------------