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/03/27 16:41:35 UTC
[03/11] incubator-weex git commit: Merge remote-tracking branch
'upstream/0.11-dev' into 0.11-dev
Merge remote-tracking branch 'upstream/0.11-dev' 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/b7835c19
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b7835c19
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b7835c19
Branch: refs/heads/0.11-dev
Commit: b7835c19cac503bd9b6093e8c1f8239c9be458bf
Parents: 1d9fbd6 1ce479e
Author: \u9690\u98ce <cx...@apache.org>
Authored: Thu Mar 23 16:58:04 2017 +0800
Committer: \u9690\u98ce <cx...@apache.org>
Committed: Thu Mar 23 16:58:04 2017 +0800
----------------------------------------------------------------------
android/sdk/assets/main.js | 14 +-
.../taobao/weex/ui/component/WXComponent.java | 6 +-
.../com/taobao/weex/ui/component/WXHeader.java | 5 +
.../com/taobao/weex/ui/component/WXLoading.java | 5 +
.../com/taobao/weex/ui/component/WXRefresh.java | 5 +
.../ui/component/list/BasicListComponent.java | 31 +-
.../ui/component/list/ListComponentView.java | 2 +-
.../ui/component/list/SimpleRecyclerView.java | 80 +----
.../ui/component/list/StickyHeaderHelper.java | 337 +++++++++++++++++++
.../taobao/weex/ui/component/list/WXCell.java | 11 +
.../refresh/wrapper/BounceRecyclerView.java | 118 +------
html5/frameworks/legacy/app/ctrl/init.js | 2 +
html5/shared/freeze.js | 47 ++-
ios/sdk/WeexSDK.podspec | 2 +-
ios/sdk/WeexSDK/Resources/main.js | 14 +-
.../Component/Recycler/WXRecyclerComponent.m | 23 ++
.../Sources/Component/WXRefreshComponent.m | 6 -
.../WeexSDK/Sources/Module/WXNavigatorModule.m | 5 +-
ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 2 +-
package.json | 2 +-
20 files changed, 477 insertions(+), 240 deletions(-)
----------------------------------------------------------------------