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/24 14:17:43 UTC
[4/7] incubator-weex git commit: Merge commit
'cba0e1a480d93aba2017144c7ea666d809362761' into 0.16-dev
Merge commit 'cba0e1a480d93aba2017144c7ea666d809362761' 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/121bd081
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/121bd081
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/121bd081
Branch: refs/heads/0.16-dev
Commit: 121bd081122c17d70b4c776320c181c98ae2a2e1
Parents: a88a00b cba0e1a
Author: gurisxie <27...@qq.com>
Authored: Thu Aug 24 20:09:27 2017 +0800
Committer: gurisxie <27...@qq.com>
Committed: Thu Aug 24 20:09:27 2017 +0800
----------------------------------------------------------------------
.../commons/adapter/FrescoImageComponent.java | 2 +-
.../java/com/alibaba/weex/WXPageActivity.java | 9 +-
android/sdk/build.gradle | 6 +
android/sdk/libs/armeabi/libweexjsb.so | Bin 0 -> 22556 bytes
android/sdk/libs/armeabi/libweexjsc.so | Bin 7570392 -> 325660 bytes
android/sdk/libs/armeabi/libweexjss.so | Bin 0 -> 6754012 bytes
.../java/com/taobao/weex/WXEnvironment.java | 16 +-
.../main/java/com/taobao/weex/WXSDKEngine.java | 3 +-
.../java/com/taobao/weex/WXSDKInstance.java | 38 +-
.../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/IWXBridge.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 +-
.../com/taobao/weex/ui/component/WXImage.java | 75 +-
.../com/taobao/weex/ui/component/WXText.java | 54 +-
.../ui/component/list/BasicListComponent.java | 113 +-
.../ui/component/list/SimpleListComponent.java | 6 +-
.../ui/component/list/StickyHeaderHelper.java | 71 +-
.../weex/ui/component/list/WXListComponent.java | 52 +-
.../com/taobao/weex/ui/view/WXImageView.java | 16 +-
.../com/taobao/weex/utils/ImageDrawable.java | 17 +-
.../com/taobao/weex/utils/TypefaceUtil.java | 8 +
.../java/com/taobao/weex/utils/WXUtils.java | 52 +-
.../taobao/weex/bridge/WXWebsocketBridge.java | 6 +
dangerfile.js | 1 +
examples/vue/index.vue | 5 +-
examples/vue/showcase/a-node-click.vue | 74 +
examples/vue/showcase/tap-penetrate.vue | 206 +
examples/vue/transition.vue | 75 +
html5/frameworks/legacy/app/differ.js | 2 +-
html5/frameworks/legacy/vm/directive.js | 2 +-
html5/render/vue/core/node.js | 64 +-
html5/render/vue/utils/event.js | 32 +-
.../complex/component-append-tree.output.js | 22 +
.../complex/component-append-tree.source.js | 87 +
html5/test/case/tester.js | 19 +
html5/test/render/vue/core/node.js | 1 -
html5/test/render/vue/utils/event.js | 10 +
.../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 | 1 +
.../Sources/Component/WXCycleSliderComponent.m | 56 +
.../Sources/Component/WXImageComponent.m | 1 +
.../WeexSDK/Sources/Component/WXListComponent.m | 52 +-
.../Sources/Component/WXSliderComponent.m | 53 +
.../Component/WXSliderNeighborComponent.m | 14 +
.../Sources/Component/WXSwitchComponent.m | 1 +
.../Sources/Component/WXTextAreaComponent.m | 3 +
.../WeexSDK/Sources/Component/WXTextComponent.m | 33 +-
ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 1 +
.../Sources/Manager/WXComponentManager.m | 8 +-
.../Sources/Manager/WXDatePickerManager.m | 8 +
.../WeexSDK/Sources/Manager/WXTracingManager.m | 2 +-
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 23 +-
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 | 6 +
.../WeexSDK/Sources/Module/WXPrerenderManager.m | 62 +-
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 +-
82 files changed, 23854 insertions(+), 22208 deletions(-)
----------------------------------------------------------------------