You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by bo...@apache.org on 2017/04/11 07:10:45 UTC
[1/2] incubator-weex git commit: * [ios] change keyboard event to
keybord and add animation for NavigationBarHidden [self.navigationController
setNavigationBarHidden:YES animated:YES];
Repository: incubator-weex
Updated Branches:
refs/heads/0.12-dev cb4d50689 -> 7be46867d
* [ios] change keyboard event to keybord and add animation for NavigationBarHidden [self.navigationController setNavigationBarHidden:YES animated:YES];
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/917ca2ab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/917ca2ab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/917ca2ab
Branch: refs/heads/0.12-dev
Commit: 917ca2ab26ab9206aaa37d55ebdd503883b55627
Parents: 51ba988
Author: \u9f50\u5c71 <su...@163.com>
Authored: Mon Apr 10 13:06:46 2017 +0800
Committer: \u9f50\u5c71 <su...@163.com>
Committed: Mon Apr 10 13:06:46 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXEditComponent.m | 8 ++++----
ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m | 5 +++--
2 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/917ca2ab/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 74ca5a2..1552347 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.m
@@ -299,7 +299,7 @@ WX_EXPORT_METHOD(@selector(getSelectionRange:))
if ([eventName isEqualToString:@"click"]) {
_clickEvent = YES;
}
- if ([eventName isEqualToString:@"keyboardevent"]) {
+ if ([eventName isEqualToString:@"keyboard"]) {
_keyboardEvent = YES;
}
}
@@ -326,7 +326,7 @@ WX_EXPORT_METHOD(@selector(getSelectionRange:))
if ([eventName isEqualToString:@"click"]) {
_clickEvent = NO;
}
- if ([eventName isEqualToString:@"keyboardevent"]) {
+ if ([eventName isEqualToString:@"keyboard"]) {
_keyboardEvent = NO;
}
}
@@ -769,7 +769,7 @@ WX_EXPORT_METHOD(@selector(getSelectionRange:))
}
if (_keyboardEvent) {
- [self fireEvent:@"keyboardevent" params:@{ @"isShow": @YES }];
+ [self fireEvent:@"keyboard" params:@{ @"isShow": @YES }];
}
}
@@ -784,7 +784,7 @@ WX_EXPORT_METHOD(@selector(getSelectionRange:))
self.weexInstance.isRootViewFrozen = NO;
}
if (_keyboardEvent) {
- [self fireEvent:@"keyboardevent" params:@{ @"isShow": @NO }];
+ [self fireEvent:@"keyboard" params:@{ @"isShow": @NO }];
}
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/917ca2ab/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m b/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m
index 1523675..a98dad6 100644
--- a/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m
+++ b/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m
@@ -70,10 +70,10 @@
self.view.backgroundColor = [UIColor whiteColor];
self.automaticallyAdjustsScrollViewInsets = NO;
[self _renderWithURL:_sourceURL];
-
if ([self.navigationController isKindOfClass:[WXRootViewController class]]) {
- self.navigationController.navigationBarHidden = YES;
+ [self.navigationController setNavigationBarHidden:YES animated:YES];
}
+
}
- (void)viewWillDisappear:(BOOL)animated
@@ -86,6 +86,7 @@
[super viewDidAppear:animated];
[_instance fireGlobalEvent:WX_APPLICATION_DID_BECOME_ACTIVE params:nil];
[self _updateInstanceState:WeexInstanceAppear];
+
}
- (void)viewDidDisappear:(BOOL)animated
[2/2] incubator-weex git commit: Merge branch
'ios-bugfix-navigation-0.12-dev' of https://github.com/kfeagle/incubator-weex
into 0.12-dev
Posted by bo...@apache.org.
Merge branch 'ios-bugfix-navigation-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/7be46867
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7be46867
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7be46867
Branch: refs/heads/0.12-dev
Commit: 7be46867d893c77ef52d2bdb3deeadd2c416e8dd
Parents: cb4d506 917ca2a
Author: bobning <ni...@163.com>
Authored: Tue Apr 11 15:10:35 2017 +0800
Committer: bobning <ni...@163.com>
Committed: Tue Apr 11 15:10:35 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXEditComponent.m | 8 ++++----
ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m | 5 +++--
2 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7be46867/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.m
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7be46867/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m
----------------------------------------------------------------------