You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by zs...@apache.org on 2017/09/05 12:05:48 UTC
[1/2] incubator-weex git commit: * [android] fix bug that the cell with ”fixed” attribute can not render
Repository: incubator-weex
Updated Branches:
refs/heads/0.16-dev 42da9ddf7 -> be18b19ef
* [android] fix bug that the cell with ”fixed” attribute can not render
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/6527e01b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/6527e01b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/6527e01b
Branch: refs/heads/0.16-dev
Commit: 6527e01b50df2e348df515a687e57fe525917b03
Parents: a2912db
Author: zshshr <zh...@gmail.com>
Authored: Tue Sep 5 17:35:47 2017 +0800
Committer: zshshr <zh...@gmail.com>
Committed: Tue Sep 5 17:35:47 2017 +0800
----------------------------------------------------------------------
.../src/main/java/com/taobao/weex/ui/component/list/WXCell.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6527e01b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java
index 9a5e468..3095c04 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java
@@ -58,7 +58,7 @@ public class WXCell extends WXVContainer<WXFrameLayout> {
@Override
public boolean isLazy() {
- return mLazy;
+ return mLazy && !isFixed();
}
public void lazy(boolean lazy) {
[2/2] incubator-weex git commit: Merge branch '0.16-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.16-dev
Posted by zs...@apache.org.
Merge branch '0.16-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.16-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/be18b19e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/be18b19e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/be18b19e
Branch: refs/heads/0.16-dev
Commit: be18b19ef78c06c83a07b36f810e1eb61e9456a0
Parents: 6527e01 42da9dd
Author: zshshr <zh...@gmail.com>
Authored: Tue Sep 5 20:05:20 2017 +0800
Committer: zshshr <zh...@gmail.com>
Committed: Tue Sep 5 20:05:20 2017 +0800
----------------------------------------------------------------------
.../WeexSDK/Sources/Component/WXEditComponent.m | 4 +-
test/pages/components/textarea-placeholder.vue | 62 ++++++++++
test/pages/include/navbar.vue | 121 +++++++++++++++++++
test/pages/include/navpage.vue | 62 ++++++++++
test/pages/modules/navigator-event.vue | 101 ++++++++++++++++
test/pages/modules/viewport-basic.vue | 62 ++++++++++
.../components/textarea-placeholder.test.js | 69 +++++++++++
test/scripts/modules/navigator-event.test.js | 51 ++++++++
test/scripts/modules/viewport-basic.test.js | 45 +++++++
test/scripts/util.js | 37 ++++++
10 files changed, 612 insertions(+), 2 deletions(-)
----------------------------------------------------------------------