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/15 08:05:13 UTC
[1/3] incubator-weex git commit: * [ios] fix issue that header at
bottom not work
Repository: incubator-weex
Updated Branches:
refs/heads/0.11-dev 2e769fa8b -> 01cb49ca2
* [ios] fix issue that header at bottom not work
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c41c0f55
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c41c0f55
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c41c0f55
Branch: refs/heads/0.11-dev
Commit: c41c0f55588e5d7ccc28fd7bf791cb940ceacf85
Parents: f9b4237
Author: \u9690\u98ce <cx...@apache.org>
Authored: Wed Mar 15 11:23:19 2017 +0800
Committer: \u9690\u98ce <cx...@apache.org>
Committed: Wed Mar 15 11:23:19 2017 +0800
----------------------------------------------------------------------
.../WeexSDK/Sources/Component/Recycler/WXMultiColumnLayout.m | 5 ++++-
.../WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c41c0f55/ios/sdk/WeexSDK/Sources/Component/Recycler/WXMultiColumnLayout.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXMultiColumnLayout.m b/ios/sdk/WeexSDK/Sources/Component/Recycler/WXMultiColumnLayout.m
index f5d641e..a959ddc 100644
--- a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXMultiColumnLayout.m
+++ b/ios/sdk/WeexSDK/Sources/Component/Recycler/WXMultiColumnLayout.m
@@ -182,9 +182,12 @@ NSString * const kMultiColumnLayoutCell = @"WXMultiColumnLayoutCell";
self.columnsMaxHeights[column] = @(CGRectGetMaxY(itemAttributes.frame));
}
+
+ currentHeight = [self _maxHeightForAllColumns];
+ [self _columnsReachToHeight:currentHeight];
}
- currentHeight = [self _maxHeightForAllColumns] + insets.bottom;
+ currentHeight = currentHeight + insets.bottom;
[self _columnsReachToHeight:currentHeight];
self.layoutAttributes[kMultiColumnLayoutHeader] = headersAttributes;
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c41c0f55/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m b/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m
index fd87ce2..4789291 100644
--- a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m
@@ -506,7 +506,7 @@ typedef enum : NSUInteger {
_previousLoadMoreCellNumber = 0;
}
-#pragma makrk - private
+#pragma mark - Private
- (float)_floatValueForColumnGap:(WXLength *)gap
{
@@ -573,7 +573,7 @@ typedef enum : NSUInteger {
}
}
- if (cellArray.count > 0) {
+ if (cellArray.count > 0 || currentSection.headerComponent) {
currentSection.cellComponents = [cellArray copy];
[sectionArray addObject:currentSection];
}
[3/3] incubator-weex git commit: Merge branch '0.11-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.11-dev
Posted by cx...@apache.org.
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/01cb49ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/01cb49ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/01cb49ca
Branch: refs/heads/0.11-dev
Commit: 01cb49ca21aaa9549dbadda709b8fa390ff1f4aa
Parents: 8896f77 2e769fa
Author: cxfeng <cx...@apache.org>
Authored: Wed Mar 15 16:03:44 2017 +0800
Committer: cxfeng <cx...@apache.org>
Committed: Wed Mar 15 16:03:44 2017 +0800
----------------------------------------------------------------------
.travis.yml | 4 +-
Dangerfile | 83 -------------
.../com/taobao/weex/bridge/WXBridgeManager.java | 22 ++--
.../taobao/weex/bridge/WXValidateProcessor.java | 15 ++-
.../java/com/taobao/weex/dom/WXDomObject.java | 4 +
.../test/java/com/taobao/weex/TestActivity.java | 4 +-
dangerfile.js | 117 +++++++++++++++++++
ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.m | 15 ++-
.../Sources/Manager/WXComponentManager.m | 1 +
package.json | 8 +-
test/ci-funcs.sh | 4 +-
11 files changed, 170 insertions(+), 107 deletions(-)
----------------------------------------------------------------------
[2/3] incubator-weex git commit: * [ios] Add footer support to
waterfall example
Posted by cx...@apache.org.
* [ios] Add footer support to waterfall example
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8896f777
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8896f777
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8896f777
Branch: refs/heads/0.11-dev
Commit: 8896f7770f10bbb1033d0e91686d6a631dafbe0b
Parents: c41c0f5
Author: \u9690\u98ce <cx...@apache.org>
Authored: Wed Mar 15 11:28:28 2017 +0800
Committer: \u9690\u98ce <cx...@apache.org>
Committed: Wed Mar 15 11:28:28 2017 +0800
----------------------------------------------------------------------
examples/vue/components/waterfall.vue | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8896f777/examples/vue/components/waterfall.vue
----------------------------------------------------------------------
diff --git a/examples/vue/components/waterfall.vue b/examples/vue/components/waterfall.vue
index 0fa64a4..ab39b7f 100644
--- a/examples/vue/components/waterfall.vue
+++ b/examples/vue/components/waterfall.vue
@@ -49,6 +49,9 @@
<text v-if="item.behaviourName" class="itemClickBehaviour"> {{item.behaviourName}}</text>
</div>
</cell>
+ <header class="footer">
+ <text class="stickyText">Footer</text>
+ </header>
<div class="fixedItem" @click="scrollToTop">
<text class="fixedText">Top</text>
</div>
@@ -201,6 +204,12 @@
margin-right: 24;
margin-bottom: 30;
}
+ .footer {
+ height: 94;
+ justify-content: center;
+ align-items: center;
+ background-color: #00cc99;
+ }
.fixedItem {
position: fixed;