You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2017/04/11 06:38:44 UTC
[13/18] incubator-weex git commit: Merge remote-tracking branch
'upstream/0.12-dev' into 0.12-dev
Merge remote-tracking branch 'upstream/0.12-dev' into 0.12-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/93987a9a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/93987a9a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/93987a9a
Branch: refs/heads/0.12-dev
Commit: 93987a9abe7f19a00c6dfaeff80e4ad8f37d347a
Parents: c18fc98 51ba988
Author: acton393 <zh...@gmail.com>
Authored: Mon Apr 10 12:17:56 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Mon Apr 10 12:17:56 2017 +0800
----------------------------------------------------------------------
.../taobao/weex/ui/component/WXComponent.java | 23 +-
.../com/taobao/weex/ui/component/WXSlider.java | 81 ++-
.../taobao/weex/ui/view/WXCircleViewPager.java | 21 +-
.../taobao/weex/ui/view/gesture/WXGesture.java | 14 +
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 8 +
.../WeexSDK/Sources/Bridge/WXBridgeContext.m | 4 +
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 77 +++
.../Component/Recycler/WXRecyclerComponent.m | 1 +
.../Sources/Component/WXCycleSliderComponent.h | 18 +
.../Sources/Component/WXCycleSliderComponent.m | 594 +++++++++++++++++++
.../Sources/Component/WXIndicatorComponent.h | 8 +
.../Sources/Component/WXIndicatorComponent.m | 16 +-
.../WeexSDK/Sources/Component/WXListComponent.m | 2 +
.../Sources/Component/WXSliderComponent.m | 5 +-
.../Component/WXSliderNeighborComponent.h | 3 +
.../Component/WXSliderNeighborComponent.m | 5 +-
.../Sources/Display/WXComponent+Display.m | 1 +
ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 1 +
.../Sources/Manager/WXComponentManager.h | 4 +
.../Sources/Manager/WXComponentManager.m | 5 +
ios/sdk/WeexSDK/Sources/Model/WXComponent.h | 6 +
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 5 +
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 1 +
.../WeexSDK/Sources/Protocol/WXBridgeProtocol.h | 5 +
ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 11 +
ios/sdk/WeexSDK/Sources/Utility/WXType.h | 5 +
.../Sources/View/WXComponent+ViewManagement.m | 3 +
test/pages/components/recycler.vue | 29 +-
test/pages/slider-infinite.vue | 49 ++
test/scripts/components/recycler.test.js | 164 ++---
test/scripts/components/slider-infinite.test.js | 38 ++
31 files changed, 1088 insertions(+), 119 deletions(-)
----------------------------------------------------------------------