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/07 06:22:08 UTC
[19/19] incubator-weex git commit: Merge branch '0.11-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.11-dev
Merge branch '0.11-dev' of https://git-wip-us.apache.org/repos/asf/incubator-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/2895fe0f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/2895fe0f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/2895fe0f
Branch: refs/heads/0.11-dev
Commit: 2895fe0ffd0c5791c425891b7b4786f0868a24a1
Parents: b700a6f 95c7470
Author: cxfeng <cx...@apache.org>
Authored: Tue Mar 7 14:21:06 2017 +0800
Committer: cxfeng <cx...@apache.org>
Committed: Tue Mar 7 14:21:06 2017 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/WXSDKInstance.java | 8 +--
.../com/taobao/weex/dom/ImmutableDomObject.java | 4 ++
.../java/com/taobao/weex/dom/WXDomObject.java | 4 ++
.../taobao/weex/ui/component/WXComponent.java | 2 +-
.../com/taobao/weex/ui/component/WXEmbed.java | 3 +
.../taobao/weex/ui/component/WXScroller.java | 8 +--
.../ui/component/helper/WXStickyHelper.java | 11 ++--
.../ui/component/list/BasicListComponent.java | 6 +-
.../com/taobao/weex/ui/view/WXScrollView.java | 4 +-
package.json | 2 +-
test/README.md | 3 +-
test/pages/components/scroller-fixed.we | 62 ++++++++++++++++++++
test/scripts/components/scroller-fixed.test.js | 39 ++++++++++++
13 files changed, 135 insertions(+), 21 deletions(-)
----------------------------------------------------------------------