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/09 08:16:12 UTC
[3/8] 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/430cf12d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/430cf12d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/430cf12d
Branch: refs/heads/0.11-dev
Commit: 430cf12d0c699b60e4e96ccb870204f8c1d6e4d6
Parents: 2a8183e a291232
Author: acton393 <zh...@gmail.com>
Authored: Wed Mar 8 15:01:43 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Wed Mar 8 15:01:43 2017 +0800
----------------------------------------------------------------------
android/sdk/build.gradle | 21 +++---
android/sdk/libs/armeabi/libweexv8.so | Bin 3583820 -> 3583820 bytes
android/sdk/libs/x86/libweexv8.so | Bin 4340864 -> 4340864 bytes
.../java/com/taobao/weex/WXSDKInstance.java | 8 +-
.../java/com/taobao/weex/common/WXThread.java | 9 +++
.../com/taobao/weex/dom/ImmutableDomObject.java | 4 +
.../java/com/taobao/weex/dom/WXDomObject.java | 4 +
.../weex/ui/animation/WXAnimationModule.java | 16 ++--
.../taobao/weex/ui/component/WXComponent.java | 8 +-
.../com/taobao/weex/ui/component/WXEmbed.java | 3 +
.../taobao/weex/ui/component/WXScroller.java | 20 ++---
.../taobao/weex/ui/component/WXVContainer.java | 3 +-
.../ui/component/helper/WXStickyHelper.java | 11 +--
.../ui/component/list/BasicListComponent.java | 41 +++++++----
.../ui/component/list/ListComponentView.java | 1 +
.../ui/component/list/SimpleRecyclerView.java | 5 ++
.../com/taobao/weex/ui/view/WXScrollView.java | 4 +-
.../refresh/wrapper/BounceRecyclerView.java | 10 ++-
.../taobao/weex/utils/WXSoInstallMgrSdk.java | 9 ++-
examples/vue/components/waterfall.vue | 8 +-
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 18 ++---
.../Component/Recycler/WXRecyclerComponent.m | 73 +++++++++++++++++--
.../Recycler/WXRecyclerUpdateController.m | 15 ++--
.../WeexSDK/Sources/Component/WXListComponent.m | 69 +++++++++++++++---
package.json | 2 +-
test/README.md | 3 +-
test/pages/components/scroller-fixed.we | 62 ++++++++++++++++
test/scripts/components/scroller-fixed.test.js | 39 ++++++++++
28 files changed, 362 insertions(+), 104 deletions(-)
----------------------------------------------------------------------