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/06 09:36:13 UTC
[5/8] incubator-weex git commit: * [ios] delete no use code
* [ios] delete no use code
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8c057d4d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8c057d4d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8c057d4d
Branch: refs/heads/0.11-dev
Commit: 8c057d4de16774c99dccbf7d678a3eee54cff6d4
Parents: c206a2f
Author: kfeagle <su...@163.com>
Authored: Sat Mar 4 14:50:30 2017 +0800
Committer: kfeagle <su...@163.com>
Committed: Sat Mar 4 14:50:30 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXEditComponent.h | 1 -
ios/sdk/WeexSDK/Sources/Component/WXEditComponent.m | 12 +++++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8c057d4d/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.h b/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.h
index fa33193..dcc74e6 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.h
+++ b/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.h
@@ -18,5 +18,4 @@
@property (nonatomic, strong) NSString *placeholderString;
@property (nonatomic, strong) UILabel *placeHolderLabel;
-@property (nonatomic, readonly) NSUInteger rows;
@end
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8c057d4d/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.m
index 4464b67..7851b41 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.m
@@ -121,11 +121,6 @@ WX_EXPORT_METHOD(@selector(getSelectionRange:))
return self;
}
--(NSUInteger )rows
-{
- return _rows;
-}
-
#pragma mark - lifeCircle
- (void)viewDidLoad
@@ -147,6 +142,7 @@ WX_EXPORT_METHOD(@selector(getSelectionRange:))
[self setTextColor:_colorForStyle];
[self setText:_value];
[self setEnabled:!_disabled];
+ [self setRows:_rows];
[self setReturnKeyType:_returnKeyType];
[self updatePattern];
@@ -276,6 +272,10 @@ WX_EXPORT_METHOD(@selector(getSelectionRange:))
{
}
+-(void)setRows:(NSUInteger)rows
+{
+}
+
#pragma mark - Add Event
- (void)addEvent:(NSString *)eventName
{
@@ -356,8 +356,10 @@ WX_EXPORT_METHOD(@selector(getSelectionRange:))
}
if (attributes[@"rows"]) {
_rows = [attributes[@"rows"] integerValue];
+ [self setRows:_rows];
} else {
_rows = 2;
+ [self setRows:_rows];
}
}