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/06/08 10:48:03 UTC
[6/6] incubator-weex git commit: Merge branch '0.13-dev' into dev
Merge branch '0.13-dev' into 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/c689a8ab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c689a8ab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c689a8ab
Branch: refs/heads/dev
Commit: c689a8ab731b80519bb1e852cce39b2e54a5c36e
Parents: c5f94f2 2b43dc5
Author: sospartan <so...@apache.org>
Authored: Thu Jun 8 18:47:44 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Thu Jun 8 18:47:44 2017 +0800
----------------------------------------------------------------------
.../java/com/alibaba/weex/WXApplication.java | 2 +
.../weex/extend/component/WXParallax.java | 345 +++++++++++++++++++
.../com/taobao/weex/bridge/WXBridgeManager.java | 2 +-
.../weex/common/ICheckBindingScroller.java | 9 +
.../taobao/weex/ui/component/WXComponent.java | 11 +
.../taobao/weex/ui/component/WXScroller.java | 9 +-
.../taobao/weex/ui/component/WXVContainer.java | 13 +
.../ui/component/list/BasicListComponent.java | 9 +-
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 2 +-
.../Sources/Component/WXCycleSliderComponent.m | 9 +-
ios/sdk/WeexSDK/Sources/Module/WXTimerModule.m | 4 +-
ios/sdk/WeexSDK/Sources/WeexSDK.h | 1 +
12 files changed, 408 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c689a8ab/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c689a8ab/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
----------------------------------------------------------------------