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/24 08:11:13 UTC
[1/3] incubator-weex git commit: + [ios] add keyboard shown event
Repository: incubator-weex
Updated Branches:
refs/heads/0.12-dev 468f4f956 -> a8316d74d
+ [ios] add keyboard shown event
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/654cff5d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/654cff5d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/654cff5d
Branch: refs/heads/0.12-dev
Commit: 654cff5d59f3c4ff59f8fb6cdda4a7b5ab1c1811
Parents: d81b16a
Author: kfeagle <su...@163.com>
Authored: Thu Mar 23 19:47:46 2017 +0800
Committer: kfeagle <su...@163.com>
Committed: Thu Mar 23 19:47:46 2017 +0800
----------------------------------------------------------------------
.../WeexSDK/Sources/Component/WXEditComponent.m | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/654cff5d/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 7851b41..7337c0d 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.m
@@ -45,6 +45,7 @@
@property (nonatomic) BOOL blurEvent;
@property (nonatomic) BOOL changeEvent;
@property (nonatomic) BOOL returnEvent;
+@property (nonatomic) BOOL keyboardEvent;
@property (nonatomic, strong) NSString *changeEventString;
@property (nonatomic, assign) CGSize keyboardSize;
@@ -71,6 +72,7 @@ WX_EXPORT_METHOD(@selector(getSelectionRange:))
_changeEvent = NO;
_returnEvent = NO;
_clickEvent = NO;
+ _keyboardEvent = NO;
// handle attributes
_autofocus = [attributes[@"autofocus"] boolValue];
_disabled = [attributes[@"disabled"] boolValue];
@@ -297,6 +299,9 @@ WX_EXPORT_METHOD(@selector(getSelectionRange:))
if ([eventName isEqualToString:@"click"]) {
_clickEvent = YES;
}
+ if ([eventName isEqualToString:@"keyboardevent"]) {
+ _keyboardEvent = YES;
+ }
}
#pragma Remove Event
@@ -321,6 +326,9 @@ WX_EXPORT_METHOD(@selector(getSelectionRange:))
if ([eventName isEqualToString:@"click"]) {
_clickEvent = NO;
}
+ if ([eventName isEqualToString:@"keyboardevent"]) {
+ _keyboardEvent = NO;
+ }
}
#pragma mark - upate attributes
@@ -658,7 +666,6 @@ WX_EXPORT_METHOD(@selector(getSelectionRange:))
{
[self setKeyboardType:UIKeyboardTypeDefault];
[self setSecureTextEntry:NO];
-
if ([_inputType isEqualToString:@"text"]) {
[self setKeyboardType:UIKeyboardTypeDefault];
}else if ([_inputType isEqualToString:@"password"]) {
@@ -669,6 +676,8 @@ WX_EXPORT_METHOD(@selector(getSelectionRange:))
[self setKeyboardType:UIKeyboardTypeEmailAddress];
}else if ([_inputType isEqualToString:@"url"]) {
[self setKeyboardType:UIKeyboardTypeURL];
+ }else if ([_inputType isEqualToString:@"number"]) {
+ [self setKeyboardType:UIKeyboardTypeNumbersAndPunctuation];
}else if ([self isDateType]) {
if (!_datePickerManager) {
_datePickerManager = [[WXDatePickerManager alloc] init];
@@ -746,6 +755,10 @@ WX_EXPORT_METHOD(@selector(getSelectionRange:))
[self setViewMovedUp:YES];
self.weexInstance.isRootViewFrozen = YES;
}
+
+ if (_keyboardEvent) {
+ [self fireEvent:@"keyboardevent" params:@{ @"isShow": @YES }];
+ }
}
- (void)keyboardWillHide:(NSNotification*)notification
@@ -758,6 +771,9 @@ WX_EXPORT_METHOD(@selector(getSelectionRange:))
[self setViewMovedUp:NO];
self.weexInstance.isRootViewFrozen = NO;
}
+ if (_keyboardEvent) {
+ [self fireEvent:@"keyboardevent" params:@{ @"isShow": @NO }];
+ }
}
- (void)closeKeyboard
[2/3] incubator-weex git commit: Merge branch
'ios-feature-text-0.12-dev' of https://github.com/kfeagle/incubator-weex into
0.12-dev
Posted by cx...@apache.org.
Merge branch 'ios-feature-text-0.12-dev' of https://github.com/kfeagle/incubator-weex into 0.12-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/c47ec867
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c47ec867
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c47ec867
Branch: refs/heads/0.12-dev
Commit: c47ec8671bcefcd64ad6f78ed731e989572460e9
Parents: 7359e64 654cff5
Author: cxfeng <cx...@apache.org>
Authored: Fri Mar 24 16:10:30 2017 +0800
Committer: cxfeng <cx...@apache.org>
Committed: Fri Mar 24 16:10:30 2017 +0800
----------------------------------------------------------------------
.../WeexSDK/Sources/Component/WXEditComponent.m | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c47ec867/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.m
----------------------------------------------------------------------
[3/3] incubator-weex git commit: Merge branch '0.12-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.12-dev
Posted by cx...@apache.org.
Merge branch '0.12-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.12-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/a8316d74
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a8316d74
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a8316d74
Branch: refs/heads/0.12-dev
Commit: a8316d74d0c364f7caa71ae39f36f8a3b5df18d9
Parents: c47ec86 468f4f9
Author: cxfeng <cx...@apache.org>
Authored: Fri Mar 24 16:11:05 2017 +0800
Committer: cxfeng <cx...@apache.org>
Committed: Fri Mar 24 16:11:05 2017 +0800
----------------------------------------------------------------------
android/sdk/assets/main.js | 14 +++++++-------
ios/sdk/WeexSDK/Resources/main.js | 14 +++++++-------
2 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------