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/24 10:32:52 UTC
[2/2] incubator-weex git commit: Merge branch 'enable-macaca-h5' into
0.12-dev
Merge branch 'enable-macaca-h5' into 0.12-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/e1be952b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e1be952b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e1be952b
Branch: refs/heads/0.12-dev
Commit: e1be952b25c8c063187c579cb1ea2e848cdda752
Parents: e578673 fc30124
Author: sospartan <so...@apache.org>
Authored: Fri Mar 24 18:32:31 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Fri Mar 24 18:32:31 2017 +0800
----------------------------------------------------------------------
build/webpack.ci.config.js | 53 +++++++++++++++
build/webpack.ci.web.config.js | 68 ++++++++++++++++++++
build/webpack.deprecatedmacacatest.config.js | 57 ++++++++++++++++
build/webpack.macacatest.config.js | 57 ----------------
package.json | 10 +--
test/.gitignore | 2 +
test/pages/components/scroller-fixed.vue | 64 ++++++++++++++++++
test/pages/components/scroller-fixed.we | 62 ------------------
test/pages/dom-operation.vue | 37 +++++++++++
test/pages/dom-operation.we | 35 ----------
test/pages/image-onload.vue | 21 ++++++
test/pages/image-onload.we | 19 ------
test/pages/index.vue | 30 +++++++++
test/pages/index.we | 27 --------
test/pages/list-scroll.vue | 34 ++++++++++
test/pages/list-scroll.we | 31 ---------
test/pages/scroller-scroll.vue | 33 ++++++++++
test/pages/scroller-scroll.we | 31 ---------
test/run.sh | 10 ++-
test/scripts/components/image-onload.test.js | 2 +-
test/scripts/components/scroll-event.test.js | 4 +-
test/scripts/components/scroller-fixed.test.js | 2 +-
.../components/textarea-maxlength.test.js | 2 +-
test/scripts/dom.test.js | 2 +-
test/scripts/index.test.js | 2 +-
test/scripts/util.js | 24 +++++++
test/serve.sh | 6 +-
27 files changed, 448 insertions(+), 277 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e1be952b/package.json
----------------------------------------------------------------------