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/03/09 08:47:53 UTC
[3/7] incubator-weex git commit: Merge branch '0.11-dev' of
https://github.com/alibaba/weex into 0.11-dev
Merge branch '0.11-dev' of https://github.com/alibaba/weex into 0.11-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/c61a2331
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c61a2331
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c61a2331
Branch: refs/heads/0.11-dev
Commit: c61a23316bc5250e8eb41732e3dae964eb4e1034
Parents: 1ee5c52 287114d
Author: atomtong <to...@qq.com>
Authored: Thu Mar 9 15:28:11 2017 +0800
Committer: atomtong <to...@qq.com>
Committed: Thu Mar 9 15:28:11 2017 +0800
----------------------------------------------------------------------
.travis.yml | 48 +-
android/sdk/libs/armeabi/libweexv8.so | Bin 3583820 -> 3583820 bytes
android/sdk/libs/x86/libweexv8.so | Bin 4340864 -> 4340864 bytes
.../main/java/com/taobao/weex/WXSDKEngine.java | 9 +-
.../java/com/taobao/weex/WXSDKInstance.java | 2 +-
.../java/com/taobao/weex/common/Constants.java | 21 +-
.../com/taobao/weex/dom/ImmutableDomObject.java | 14 +-
.../main/java/com/taobao/weex/dom/WXAttr.java | 96 +++-
.../java/com/taobao/weex/dom/WXDomHandler.java | 2 +
.../java/com/taobao/weex/dom/WXDomManager.java | 1 +
.../java/com/taobao/weex/dom/WXDomModule.java | 18 +-
.../taobao/weex/dom/WXRecyclerDomObject.java | 317 +++++++++++
.../java/com/taobao/weex/dom/flex/CSSNode.java | 8 +-
.../com/taobao/weex/http/WXStreamModule.java | 28 +-
.../com/taobao/weex/ui/WXRenderStatement.java | 14 +-
.../ui/animation/BackgroundColorProperty.java | 252 +++++++++
.../weex/ui/animation/WXAnimationModule.java | 4 +-
.../weex/ui/component/WXBasicComponentType.java | 2 +
.../taobao/weex/ui/component/WXComponent.java | 9 +-
.../com/taobao/weex/ui/component/WXHeader.java | 4 +-
.../com/taobao/weex/ui/component/WXImage.java | 29 +-
.../com/taobao/weex/ui/component/WXLoading.java | 7 +-
.../com/taobao/weex/ui/component/WXSlider.java | 20 +-
.../taobao/weex/ui/component/WXVContainer.java | 13 +
.../ui/component/list/BasicListComponent.java | 133 ++++-
.../ui/component/list/ListComponentView.java | 3 -
.../ui/component/list/SimpleListComponent.java | 6 +-
.../weex/ui/component/list/WXListComponent.java | 91 +++-
.../com/taobao/weex/ui/view/WXImageView.java | 20 +-
.../weex/ui/view/border/BorderDrawable.java | 5 +-
.../taobao/weex/ui/view/border/BorderEdge.java | 71 +--
.../listview/ExtendedLinearLayoutManager.java | 25 +
.../weex/ui/view/listview/WXRecyclerView.java | 43 +-
.../listview/adapter/ListBaseViewHolder.java | 42 +-
.../adapter/RecyclerViewBaseAdapter.java | 21 +-
.../adapter/WXRecyclerViewOnScrollListener.java | 107 ++--
.../ui/view/refresh/wrapper/BaseBounceView.java | 25 +-
.../refresh/wrapper/BounceRecyclerView.java | 23 +-
.../refresh/wrapper/BounceScrollerView.java | 1 +
.../java/com/taobao/weex/utils/WXFileUtils.java | 37 +-
.../java/com/taobao/weex/utils/WXViewUtils.java | 71 ++-
examples/module/websocket-demo.we | 222 ++++----
examples/vue/components/waterfall.vue | 455 ++++++++++++++++
examples/vue/index.vue | 1 +
ios/playground/Podfile | 2 +-
ios/playground/WeexDemo.app.zip | Bin 2561323 -> 0 bytes
ios/playground/WeexDemo/DemoDefine.h | 2 +-
ios/playground/WeexDemo/UIView+UIThreadCheck.m | 2 +-
ios/playground/WeexDemo/WXDemoViewController.m | 3 +-
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 115 +++-
ios/sdk/WeexSDK/Sources/Bridge/WXBridgeMethod.m | 2 +
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 11 +-
.../Component/Recycler/WXMultiColumnLayout.h | 42 ++
.../Component/Recycler/WXMultiColumnLayout.m | 388 ++++++++++++++
.../Component/Recycler/WXRecyclerComponent.h | 12 +
.../Component/Recycler/WXRecyclerComponent.m | 525 +++++++++++++++++++
.../Recycler/WXRecyclerDataController.h | 34 ++
.../Recycler/WXRecyclerDataController.m | 114 ++++
.../Recycler/WXRecyclerUpdateController.h | 32 ++
.../Recycler/WXRecyclerUpdateController.m | 248 +++++++++
.../Recycler/WXSectionDataController.h | 33 ++
.../Recycler/WXSectionDataController.m | 81 +++
.../WeexSDK/Sources/Component/WXCellComponent.h | 23 +-
.../WeexSDK/Sources/Component/WXCellComponent.m | 32 +-
.../Component/WXComponent+GradientColor.h | 15 +-
.../Component/WXComponent+GradientColor.m | 15 +-
.../Sources/Component/WXComponent_internal.h | 3 +
.../WeexSDK/Sources/Component/WXEditComponent.h | 2 +-
.../WeexSDK/Sources/Component/WXEditComponent.m | 1 -
.../Sources/Component/WXFooterComponent.h | 13 +
.../Sources/Component/WXFooterComponent.m | 13 +
.../Sources/Component/WXHeaderComponent.h | 28 +
.../Sources/Component/WXHeaderComponent.m | 76 +++
.../WeexSDK/Sources/Component/WXListComponent.h | 12 -
.../WeexSDK/Sources/Component/WXListComponent.m | 251 ++++++---
.../Sources/Component/WXRefreshComponent.h | 6 +-
.../Sources/Component/WXScrollerComponent.m | 19 +-
.../Sources/Component/WXTextAreaComponent.m | 16 +-
.../Sources/Component/WXTextInputComponent.h | 2 +-
ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 18 +-
.../Sources/Display/WXComponent+BoxShadow.h | 37 ++
.../Sources/Display/WXComponent+BoxShadow.m | 91 ++++
ios/sdk/WeexSDK/Sources/Display/WXInnerLayer.h | 19 +
ios/sdk/WeexSDK/Sources/Display/WXInnerLayer.m | 87 +++
ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 2 +
.../WeexSDK/Sources/Layout/WXComponent+Layout.m | 4 +
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 11 +-
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.h | 1 +
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 6 +-
.../WeexSDK/Sources/Module/WXAnimationModule.m | 12 +-
ios/sdk/WeexSDK/Sources/Module/WXMetaModule.m | 4 +-
.../WeexSDK/Sources/Module/WXWebSocketModule.m | 4 +-
.../Sources/Protocol/WXJSExceptionProtocol.h | 6 +-
ios/sdk/WeexSDK/Sources/Utility/WXBoxShadow.h | 31 ++
ios/sdk/WeexSDK/Sources/Utility/WXBoxShadow.m | 108 ++++
ios/sdk/WeexSDK/Sources/Utility/WXConvert.h | 5 +
ios/sdk/WeexSDK/Sources/Utility/WXConvert.m | 99 +++-
ios/sdk/WeexSDK/Sources/Utility/WXDiffUtil.h | 38 ++
ios/sdk/WeexSDK/Sources/Utility/WXDiffUtil.m | 186 +++++++
ios/sdk/WeexSDK/Sources/Utility/WXLength.h | 13 +-
ios/sdk/WeexSDK/Sources/Utility/WXLength.m | 45 +-
ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 2 +-
.../Sources/View/WXComponent+ViewManagement.m | 21 +-
test/ci-funcs.sh | 49 +-
test/pages/image-onload.we | 19 +
test/scripts/components/image-onload.test.js | 39 ++
106 files changed, 4870 insertions(+), 580 deletions(-)
----------------------------------------------------------------------