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/10 06:21:11 UTC
[2/9] incubator-weex git commit: Merge remote-tracking branch
'upstream/0.12-dev' into 0.12-dev
Merge remote-tracking branch 'upstream/0.12-dev' 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/9076095f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9076095f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9076095f
Branch: refs/heads/0.12-dev
Commit: 9076095f84cbc8b886ecba10ec8a74d70ad92d8e
Parents: 7f60621 e1be952
Author: moxun.ljf <fu...@foxmail.com>
Authored: Mon Mar 27 10:53:23 2017 +0800
Committer: moxun.ljf <fu...@foxmail.com>
Committed: Mon Mar 27 10:53:23 2017 +0800
----------------------------------------------------------------------
android/sdk/assets/main.js | 14 ++--
.../ui/component/list/BasicListComponent.java | 2 +-
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 ----------------
html5/frameworks/legacy/app/ctrl/init.js | 2 +
html5/shared/freeze.js | 47 ++++++++------
ios/sdk/WeexSDK/Resources/main.js | 14 ++--
ios/sdk/WeexSDK/Sources/Bridge/WXBridgeMethod.h | 2 +-
ios/sdk/WeexSDK/Sources/Bridge/WXBridgeMethod.m | 2 +-
.../WeexSDK/Sources/Component/WXEditComponent.m | 30 ++++++++-
.../Sources/Component/WXRefreshComponent.m | 2 +-
.../Sources/Component/WXSliderComponent.m | 6 +-
package.json | 12 ++--
test/.gitignore | 2 +
test/pages/components/scroller-fixed.vue | 64 ++++++++++++++++++
test/pages/components/scroller-fixed.we | 62 ------------------
test/pages/components/textarea-maxlength.vue | 50 ++++++++++++++
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 | 36 +++++++++++
test/scripts/dom.test.js | 2 +-
test/scripts/index.test.js | 2 +-
test/scripts/util.js | 24 +++++++
test/serve.sh | 6 +-
38 files changed, 615 insertions(+), 317 deletions(-)
----------------------------------------------------------------------