Merge branch '0.16-dev' into 0.16-dev-web
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b0741d80 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b0741d80 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b0741d80 Branch: refs/heads/0.16-dev Commit: b0741d806e55285523fcf1ba0cd5a8dc0872ed84 Parents: 60ce630 42da9dd Author: MrRaindrop <tekk...@gmail.com> Authored: Tue Sep 5 11:16:29 2017 +0800 Committer: MrRaindrop <tekk...@gmail.com> Committed: Tue Sep 5 11:16:29 2017 +0800 ---------------------------------------------------------------------- .../commons/adapter/FrescoImageComponent.java | 2 +- .../java/com/alibaba/weex/WXPageActivity.java | 5 +- android/sdk/build.gradle | 6 + 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 ++- .../java/com/taobao/weex/common/Constants.java | 1 + .../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 | 29 ++- .../taobao/weex/ui/component/WXVContainer.java | 6 + .../ui/component/list/BasicListComponent.java | 204 +++++++++---------- .../ui/component/list/SimpleListComponent.java | 6 +- .../ui/component/list/StickyHeaderHelper.java | 71 ++++--- .../weex/ui/component/list/WXListComponent.java | 83 +++----- .../com/taobao/weex/ui/view/WXImageView.java | 16 +- .../com/taobao/weex/utils/ImageDrawable.java | 17 +- .../java/com/taobao/weex/utils/WXUtils.java | 64 +++--- 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 +++- ios/playground/WeexDemo/Scanner/WXScannerVC.m | 2 +- .../WeexDemo/WXConfigCenterDefaultImpl.m | 6 +- ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 20 +- .../WeexSDK/Sources/Component/WXAComponent.m | 1 + .../Sources/Component/WXComponent_internal.h | 3 +- .../Sources/Component/WXCycleSliderComponent.m | 56 +++++ .../WeexSDK/Sources/Component/WXEditComponent.m | 9 +- .../Sources/Component/WXImageComponent.m | 4 + .../Sources/Component/WXSliderComponent.m | 53 +++++ .../Component/WXSliderNeighborComponent.m | 14 ++ .../Sources/Component/WXSwitchComponent.m | 2 + .../Sources/Component/WXTextAreaComponent.m | 4 + .../WeexSDK/Sources/Component/WXTextComponent.m | 19 +- ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 2 +- .../Sources/Controller/WXBaseViewController.m | 4 +- ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 1 + .../Sources/Manager/WXComponentManager.h | 8 + .../Sources/Manager/WXComponentManager.m | 26 ++- .../Sources/Manager/WXDatePickerManager.m | 8 + .../WeexSDK/Sources/Manager/WXTracingManager.m | 2 +- ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 38 ++-- ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 7 +- ios/sdk/WeexSDK/Sources/Module/WXPickerModule.m | 44 ++++ .../WeexSDK/Sources/Module/WXPrerenderManager.h | 21 ++ .../WeexSDK/Sources/Module/WXPrerenderManager.m | 120 ++++++++--- .../WeexSDK/Sources/Module/WXVoiceOverModule.h | 25 +++ .../WeexSDK/Sources/Module/WXVoiceOverModule.m | 148 ++++++++++++++ ios/sdk/WeexSDK/Sources/Utility/WXConvert.m | 2 +- ios/sdk/WeexSDK/Sources/WeexSDK.h | 2 + test/mocha.opts | 2 - test/pages/attributes/dom-operation.vue | 33 +++ test/pages/components/a-src.vue | 86 ++++++++ test/pages/components/a-support-href1.vue | 58 ++++++ test/pages/components/a-support-href2.vue | 58 ++++++ test/pages/components/hyperlink.vue | 31 --- test/pages/components/hyperlink_target.vue | 23 --- test/pages/components/image-onload.vue | 65 ++++++ test/pages/components/image-resize.vue | 97 +++++++++ test/pages/components/list-scroll.vue | 33 +++ test/pages/components/refresh-loading.vue | 20 +- test/pages/components/scroller-scroll.vue | 31 +++ test/pages/components/slider-infinite.vue | 54 +++++ test/pages/components/textarea-placeholder.vue | 62 ++++++ test/pages/components/video-property.vue | 97 +++++++++ test/pages/components/web-event.vue | 55 ++++- test/pages/dom-operation.vue | 33 --- test/pages/image-onload.vue | 31 --- test/pages/include/navbar.vue | 121 +++++++++++ test/pages/include/navpage.vue | 62 ++++++ test/pages/index.vue | 30 --- test/pages/list-scroll.vue | 33 --- test/pages/modules/dom-common.vue | 87 ++++++++ test/pages/modules/dom-update.vue | 78 +++++++ test/pages/modules/downgrade-event.vue | 2 +- test/pages/modules/modal-event.vue | 75 +++++-- test/pages/modules/navigator-event.vue | 101 +++++++++ test/pages/modules/stream-result.vue | 185 +++++++++++++---- test/pages/modules/viewport-basic.vue | 62 ++++++ test/pages/scroller-scroll.vue | 31 --- test/pages/slider-infinite.vue | 54 ----- test/screenshot/image-resize-android.png | Bin 0 -> 214440 bytes test/screenshot/image-resize-ios.png | Bin 0 -> 138033 bytes test/scripts/attributes/compositing.test.js | 5 +- test/scripts/attributes/dom.test.js | 98 +++++++++ test/scripts/components/a-src.test.js | 65 ++++++ 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/image-resize.test.js | 43 ++++ 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 +- .../components/textarea-placeholder.test.js | 69 +++++++ test/scripts/components/video-property.test.js | 45 ++++ test/scripts/components/web-event.test.js | 22 +- 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/dom-common.test.js | 36 ++++ test/scripts/modules/dom-update.test.js | 51 +++++ test/scripts/modules/gesture-longpress.test.js | 5 +- test/scripts/modules/globalEvent.test.js | 2 +- test/scripts/modules/modal-event.test.js | 18 +- test/scripts/modules/navigator-event.test.js | 51 +++++ test/scripts/modules/picker-event.test.js | 5 +- test/scripts/modules/stream-result.test.js | 20 +- test/scripts/modules/timer.test.js | 5 +- test/scripts/modules/viewport-basic.test.js | 45 ++++ test/scripts/util.js | 58 +++++- 137 files changed, 3375 insertions(+), 1087 deletions(-) ----------------------------------------------------------------------