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:05 UTC
[5/5] incubator-weex git commit: Merge branch '0.11-dev' into 0.12-dev
Merge branch '0.11-dev' into 0.12-dev
# Conflicts:
# .eslintrc
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a52afae7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a52afae7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a52afae7
Branch: refs/heads/0.12-dev
Commit: a52afae75f4381f387caf4be8473ce31bbb40966
Parents: b74c338 58fd3fe
Author: sospartan <so...@apache.org>
Authored: Fri Mar 31 18:08:47 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Fri Mar 31 18:08:47 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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a52afae7/.eslintrc
----------------------------------------------------------------------
diff --cc .eslintrc
index 7e4bd0f,80d82b7..f3d34fd
--- a/.eslintrc
+++ b/.eslintrc
@@@ -30,9 -30,7 +30,10 @@@
"callNativeModule": false,
"callAddElement":false,
"callJS": false,
+ "notifyTrimMemory": false,
+ "markupState": false,
- "compileAndRunBundle": false
++ "compileAndRunBundle": false,
+ "expect": false
},
"rules": {
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a52afae7/package.json
----------------------------------------------------------------------