You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by gu...@apache.org on 2017/10/11 11:05:33 UTC
[5/6] incubator-weex git commit: Revert "* [ios] set default value to
nil when the configuration is empty"
Revert "* [ios] set default value to nil when the configuration is empty"
This reverts commit 4376205615fdcbd4fd9f118a02961e074eb057bf.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/bdf512cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/bdf512cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/bdf512cf
Branch: refs/heads/master
Commit: bdf512cf39900ce8d8a3892e40d009cd3203fc7a
Parents: d94c3c7
Author: acton393 <zh...@gmail.com>
Authored: Wed Oct 11 12:25:29 2017 +0800
Committer: gurisxie <27...@qq.com>
Committed: Wed Oct 11 19:05:12 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bdf512cf/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
index fafc41d..b7a522a 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
@@ -122,13 +122,9 @@ WX_EXPORT_METHOD(@selector(resetLoadmore))
if (attributes[@"alwaysScrollableVertical"]) {
_alwaysScrollableVertical = [WXConvert NSString:attributes[@"alwaysScrollableVertical"]];
- }else {
- _alwaysScrollableVertical = nil;
}
if (attributes[@"alwaysScrollableHorizontal"]) {
_alwaysScrollableHorizontal = [WXConvert NSString:attributes[@"alwaysScrollableHorizontal"]];
- } else {
- _alwaysScrollableHorizontal = nil;
}
_pagingEnabled = attributes[@"pagingEnabled"] ? [WXConvert BOOL:attributes[@"pagingEnabled"]] : NO;
_loadMoreOffset = attributes[@"loadmoreoffset"] ? [WXConvert WXPixelType:attributes[@"loadmoreoffset"] scaleFactor:self.weexInstance.pixelScaleFactor] : 0;