You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by kf...@apache.org on 2017/08/31 09:52:45 UTC
[4/4] incubator-weex git commit: Merge branch '0.16-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.16-dev
Merge branch '0.16-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.16-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/6b9f23b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/6b9f23b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/6b9f23b1
Branch: refs/heads/0.16-dev
Commit: 6b9f23b10f7e89e995d2e6a5071d98f648676f84
Parents: 4dada16 ec30d17
Author: 齐山 <su...@163.com>
Authored: Thu Aug 31 17:52:05 2017 +0800
Committer: 齐山 <su...@163.com>
Committed: Thu Aug 31 17:52:05 2017 +0800
----------------------------------------------------------------------
.../java/com/alibaba/weex/WXPageActivity.java | 14 +-
android/sdk/build.gradle | 6 +
.../java/com/taobao/weex/WXEnvironment.java | 16 +-
.../main/java/com/taobao/weex/WXSDKEngine.java | 3 +-
.../java/com/taobao/weex/WXSDKInstance.java | 51 +-
.../taobao/weex/adapter/IDrawableLoader.java | 11 +-
.../java/com/taobao/weex/bridge/WXBridge.java | 14 +
.../com/taobao/weex/bridge/WXBridgeManager.java | 175 +-
.../java/com/taobao/weex/common/Constants.java | 1 +
.../java/com/taobao/weex/common/IWXBridge.java | 2 +
.../com/taobao/weex/common/IWXDebugProxy.java | 2 +
.../com/taobao/weex/common/WXErrorCode.java | 14 +-
.../taobao/weex/common/WXJSBridgeMsgType.java | 2 +
.../com/taobao/weex/dom/action/Actions.java | 3 +
.../weex/dom/action/ReloadPageAction.java | 64 +
.../taobao/weex/dom/action/TraceableAction.java | 1 +
.../ui/component/AbstractEditComponent.java | 4 +-
.../weex/ui/component/AppearanceHelper.java | 9 +-
.../taobao/weex/ui/component/WXScroller.java | 2 +-
.../com/taobao/weex/ui/component/WXText.java | 63 +-
.../taobao/weex/ui/component/WXVContainer.java | 6 +
.../ui/component/list/BasicListComponent.java | 209 +-
.../ui/component/list/SimpleListComponent.java | 6 +-
.../ui/component/list/StickyHeaderHelper.java | 71 +-
.../weex/ui/component/list/WXListComponent.java | 52 +-
.../com/taobao/weex/utils/TypefaceUtil.java | 8 +
.../java/com/taobao/weex/utils/WXUtils.java | 20 +-
.../taobao/weex/bridge/WXWebsocketBridge.java | 6 +
dangerfile.js | 3 +-
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 +-
examples/vue/index.vue | 1 -
examples/vue/transition.vue | 75 +
html5/frameworks/legacy/app/differ.js | 2 +-
html5/frameworks/legacy/vm/directive.js | 2 +-
.../complex/component-append-tree.output.js | 22 +
.../complex/component-append-tree.source.js | 87 +
html5/test/case/tester.js | 19 +
ios/playground/WeexDemo/Scanner/WXScannerVC.m | 2 +-
.../WeexDemo/WXConfigCenterDefaultImpl.m | 6 +-
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 20 +-
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 5 +-
.../WeexSDK/Sources/Component/WXAComponent.m | 1 +
.../Sources/Component/WXComponent_internal.h | 3 +-
.../Sources/Component/WXCycleSliderComponent.m | 56 +
.../Sources/Component/WXImageComponent.m | 1 +
.../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 +-
.../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.h | 7 +
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 7 +-
.../WeexSDK/Sources/Module/WXAnimationModule.h | 4 -
.../WeexSDK/Sources/Module/WXAnimationModule.m | 7 -
ios/sdk/WeexSDK/Sources/Module/WXPickerModule.m | 44 +
.../WeexSDK/Sources/Module/WXPrerenderManager.h | 21 +
.../WeexSDK/Sources/Module/WXPrerenderManager.m | 120 +-
ios/sdk/WeexSDK/Sources/Module/WXTransition.h | 2 -
ios/sdk/WeexSDK/Sources/Module/WXTransition.m | 214 +-
.../WeexSDK/Sources/Module/WXVoiceOverModule.h | 25 +
.../WeexSDK/Sources/Module/WXVoiceOverModule.m | 148 +
ios/sdk/WeexSDK/Sources/Utility/WXConvert.h | 1 +
ios/sdk/WeexSDK/Sources/Utility/WXConvert.m | 17 +
.../Sources/View/WXComponent+ViewManagement.m | 1 -
ios/sdk/WeexSDK/Sources/WeexSDK.h | 2 +
ios/sdk/WeexSDKTests/WXConvertTests.m | 21 +-
package.json | 7 +-
packages/weex-js-framework/index.js | 43740 +++++++++--------
packages/weex-js-framework/index.min.js | 9 +-
pre-build/native-bundle-main.js | 16 +-
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/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/switch-event.vue | 7 +-
test/pages/components/video-property.vue | 97 +
test/pages/dom-operation.vue | 33 -
test/pages/image-onload.vue | 31 -
test/pages/include/wxc-desc.vue | 27 +-
test/pages/index.vue | 30 -
test/pages/list-scroll.vue | 33 -
test/pages/modules/modal-event.vue | 75 +-
test/pages/modules/stream-result.vue | 185 +-
test/pages/modules/vue_timer.vue | 8 +-
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 | 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/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 | 69 +-
.../components/textarea-maxlength.test.js | 3 +-
test/scripts/components/video-property.test.js | 45 +
test/scripts/components/web-event.test.js | 2 +-
test/scripts/css/border.test.js | 3 +-
test/scripts/dom.test.js | 94 -
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 | 22 +-
test/scripts/modules/modal-event.test.js | 20 +-
test/scripts/modules/picker-event.test.js | 5 +-
test/scripts/modules/stream-result.test.js | 20 +-
test/scripts/modules/timer.test.js | 56 +-
test/scripts/util.js | 23 +-
147 files changed, 25094 insertions(+), 22922 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6b9f23b1/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6b9f23b1/ios/sdk/WeexSDK/Sources/Utility/WXConvert.m
----------------------------------------------------------------------