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/03/31 10:09:04 UTC
[4/5] incubator-weex git commit: Merge branch '0.11-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex;
branch 'dev-web-test' of http://github.com/MrRaindrop/incubator-weex into
0.11-dev This closes #202
Merge branch '0.11-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex; branch 'dev-web-test' of http://github.com/MrRaindrop/incubator-weex into 0.11-dev
This closes #202
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/58fd3fe7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/58fd3fe7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/58fd3fe7
Branch: refs/heads/0.12-dev
Commit: 58fd3fe79a327ca84f694d54eaa69374ca0817af
Parents: f8abba9 82ff96d
Author: sospartan <so...@apache.org>
Authored: Fri Mar 31 17:41:58 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Fri Mar 31 17:41:58 2017 +0800
----------------------------------------------------------------------
.eslintrc | 3 +-
build/karma.vue.conf.js | 64 ++++++---
dangerfile.js | 6 +-
html5/render/vue/components/a.js | 3 +-
html5/render/vue/components/div.js | 10 +-
html5/render/vue/components/image.js | 2 +-
html5/render/vue/mixins/base.js | 7 +
html5/test/render/index.js | 3 -
html5/test/render/vue/components/a.js | 38 ++++++
html5/test/render/vue/components/div.js | 29 +++++
html5/test/render/vue/components/image.js | 44 ++++---
html5/test/render/vue/components/list.js | 21 ++-
html5/test/render/vue/components/switch.js | 35 ++---
html5/test/render/vue/components/text.js | 42 +++---
html5/test/render/vue/components/web.js | 14 +-
html5/test/render/vue/examples/list-cell.js | 16 +--
html5/test/render/vue/helper.js | 157 +++++++++++++++++++----
html5/test/render/vue/utils.js | 1 -
html5/test/render/vue/validator/check.js | 1 -
html5/test/render/vue/validator/index.js | 1 -
html5/test/render/vue/validator/prop.js | 1 -
html5/test/render/vue/validator/style.js | 1 -
package.json | 4 +-
23 files changed, 354 insertions(+), 149 deletions(-)
----------------------------------------------------------------------