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/02 02:53:54 UTC
[07/20] incubator-weex git commit: * [ios] cancel useless logic
* [ios] cancel useless logic
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/2165b85e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/2165b85e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/2165b85e
Branch: refs/heads/master
Commit: 2165b85ec47eb540068ec5b2566f36d238ad88be
Parents: cfdaa67
Author: acton393 <zh...@gmail.com>
Authored: Fri Sep 29 18:27:08 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri Sep 29 18:27:08 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2165b85e/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 6bcfd9a..d592a8c 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
@@ -223,12 +223,12 @@ WX_EXPORT_METHOD(@selector(resetLoadmore))
((UIScrollView *)self.view).scrollEnabled = _scrollable;
}
if (attributes[@"alwaysScrollableHorizontal"]) {
- _alwaysScrollableHorizontal = attributes[@"alwaysScrollableHorizontal"]?[WXConvert BOOL:attributes[@"alwaysScrollableHorizontal"]]:NO;
+ _alwaysScrollableHorizontal = [WXConvert BOOL:attributes[@"alwaysScrollableHorizontal"]];
((UIScrollView*)self.view).alwaysBounceHorizontal = _alwaysScrollableHorizontal;
}
if (attributes[@"alwaysScrollableVertical"]) {
- _alwaysScrollableVertical = attributes[@"alwaysScrollableVertical"]?[WXConvert BOOL:attributes[@"alwaysScrollableVertical"]]:NO;
+ _alwaysScrollableVertical = [WXConvert BOOL:attributes[@"alwaysScrollableVertical"]];
((UIScrollView*)self.view).alwaysBounceVertical = _alwaysScrollableVertical;
}
if (attributes[@"offsetAccuracy"]) {