You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ac...@apache.org on 2017/08/30 03:34:37 UTC
[2/3] incubator-weex git commit: Merge branch '0.16-dev' of
https://github.com/apache/incubator-weex into 0.16-dev-test
Merge branch '0.16-dev' of https://github.com/apache/incubator-weex into 0.16-dev-test
Conflicts:
test/scripts/modules/modal-event.test.js
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/28d33646
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/28d33646
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/28d33646
Branch: refs/heads/0.16-dev
Commit: 28d33646077830ebbcc32c1995da2ed8501f133c
Parents: 5ad9493 1295c90
Author: miomin <69...@qq.com>
Authored: Wed Aug 30 10:13:57 2017 +0800
Committer: miomin <69...@qq.com>
Committed: Wed Aug 30 10:13:57 2017 +0800
----------------------------------------------------------------------
.../commons/adapter/FrescoImageComponent.java | 2 +-
.../java/com/alibaba/weex/WXPageActivity.java | 5 +-
android/sdk/libs/armeabi/libweexjsb.so | Bin 22556 -> 0 bytes
android/sdk/libs/armeabi/libweexjsc.so | Bin 325660 -> 7570392 bytes
android/sdk/libs/armeabi/libweexjss.so | Bin 6754012 -> 0 bytes
.../java/com/taobao/weex/WXSDKInstance.java | 23 +++--
.../com/taobao/weex/common/IWXDebugProxy.java | 2 +
.../weex/ui/component/AppearanceHelper.java | 9 +-
.../com/taobao/weex/ui/component/WXImage.java | 75 +++++++-------
.../taobao/weex/ui/component/WXScroller.java | 2 +-
.../com/taobao/weex/ui/component/WXText.java | 25 +++--
.../taobao/weex/ui/component/WXVContainer.java | 6 ++
.../ui/component/list/BasicListComponent.java | 56 +++++++++--
.../com/taobao/weex/ui/view/WXImageView.java | 16 +--
.../com/taobao/weex/utils/ImageDrawable.java | 17 +++-
dangerfile.js | 2 +-
doc/_config.yml | 2 +
doc/_config_cn.yml | 2 +
doc/source/cn/guide/integrate-to-your-app.md | 6 +-
doc/source/cn/guide/tools/index.md | 1 +
doc/source/cn/guide/tools/plugin.md | 77 +++++++++++++++
doc/source/cn/references/common-style.md | 59 ++++++++++-
doc/source/cn/references/modules/animation.md | 37 +++----
doc/source/guide/integrate-to-your-app.md | 6 +-
doc/source/guide/tools/index.md | 1 +
doc/source/guide/tools/plugin.md | 68 +++++++++++++
doc/source/references/common-style.md | 57 +++++++++++
doc/source/references/modules/animation.md | 46 ++++-----
doc/themes/weex/languages/en.yml | 2 +-
.../weex/layout/_partial/after-footer.ejs | 10 ++
doc/themes/weex/layout/_partial/header.ejs | 3 +
doc/themes/weex/layout/_partial/sidebar.ejs | 3 +
doc/themes/weex/source/css/index.scss | 42 ++++++--
.../WeexSDK/Sources/Component/WXAComponent.m | 3 -
.../Sources/Component/WXComponent_internal.h | 4 +-
.../Sources/Component/WXImageComponent.m | 4 +-
.../Sources/Component/WXSwitchComponent.m | 4 +-
.../Sources/Component/WXTextAreaComponent.m | 4 +-
.../WeexSDK/Sources/Component/WXTextComponent.m | 5 +-
.../Sources/Controller/WXBaseViewController.m | 4 +-
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 41 ++++----
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 4 +-
.../WeexSDK/Sources/Module/WXPrerenderManager.h | 15 +++
.../WeexSDK/Sources/Module/WXPrerenderManager.m | 62 ++++++++++--
test/mocha.opts | 2 -
test/pages/attributes/dom-operation.vue | 33 +++++++
test/pages/components/a-src.vue | 19 ++++
test/pages/components/hyperlink.vue | 31 ------
test/pages/components/hyperlink_target.vue | 23 -----
test/pages/components/image-onload.vue | 65 ++++++++++++
test/pages/components/list-scroll.vue | 33 +++++++
test/pages/components/scroller-scroll.vue | 31 ++++++
test/pages/components/slider-infinite.vue | 54 ++++++++++
test/pages/dom-operation.vue | 33 -------
test/pages/image-onload.vue | 31 ------
test/pages/index.vue | 30 ------
test/pages/list-scroll.vue | 33 -------
test/pages/scroller-scroll.vue | 31 ------
test/pages/slider-infinite.vue | 54 ----------
test/scripts/attributes/compositing.test.js | 5 +-
test/scripts/attributes/dom.test.js | 98 +++++++++++++++++++
test/scripts/components/a-src.test.js | 44 ++++++---
test/scripts/components/hyperlink.test.js | 44 ---------
test/scripts/components/iconfont.test.js | 2 +-
test/scripts/components/image-onload.test.js | 32 ++----
test/scripts/components/input-event.test.js | 2 +-
test/scripts/components/recycler.test.js | 20 +++-
test/scripts/components/refresh-loading.test.js | 12 +--
test/scripts/components/scroll-event.test.js | 11 ++-
test/scripts/components/scroller-fixed.test.js | 2 +-
test/scripts/components/slider-common.test.js | 4 +-
test/scripts/components/slider-infinite.test.js | 4 +-
test/scripts/components/switch-event.test.js | 2 +-
test/scripts/components/text.test.js | 8 +-
.../components/textarea-maxlength.test.js | 3 +-
test/scripts/components/video-property.test.js | 2 +-
test/scripts/components/web-event.test.js | 2 +-
test/scripts/css/border.test.js | 3 +-
test/scripts/dom.test.js | 97 ------------------
test/scripts/index.test.js | 77 ---------------
.../scripts/modules/animation-translate.test.js | 5 +-
test/scripts/modules/clipboard-event.test.js | 5 +-
test/scripts/modules/gesture-longpress.test.js | 5 +-
test/scripts/modules/globalEvent.test.js | 2 +-
test/scripts/modules/modal-event.test.js | 1 -
test/scripts/modules/picker-event.test.js | 5 +-
test/scripts/modules/timer.test.js | 5 +-
test/scripts/util.js | 21 ++--
88 files changed, 1065 insertions(+), 773 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/28d33646/test/scripts/modules/modal-event.test.js
----------------------------------------------------------------------