You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2015/03/30 16:12:56 UTC
[2/6] cordova-plugins git commit: Handle split and undocked
keyboards. They should hover over the app and not resize the webview.
Handle split and undocked keyboards. They should hover over the app and not resize the webview.
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugins/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugins/commit/fcd495cb
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugins/tree/fcd495cb
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugins/diff/fcd495cb
Branch: refs/heads/master
Commit: fcd495cb9614edba6c55dbfc57d7b0deca5d3172
Parents: 3a12b96
Author: Connor Pearson <cj...@gmail.com>
Authored: Mon Jan 12 13:27:58 2015 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Mar 30 10:12:23 2015 -0400
----------------------------------------------------------------------
keyboard/src/ios/CDVKeyboard.m | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugins/blob/fcd495cb/keyboard/src/ios/CDVKeyboard.m
----------------------------------------------------------------------
diff --git a/keyboard/src/ios/CDVKeyboard.m b/keyboard/src/ios/CDVKeyboard.m
index 7df567a..3146ab4 100644
--- a/keyboard/src/ios/CDVKeyboard.m
+++ b/keyboard/src/ios/CDVKeyboard.m
@@ -70,14 +70,12 @@
queue:[NSOperationQueue mainQueue]
usingBlock:^(NSNotification* notification) {
[weakSelf.commandDelegate evalJs:@"Keyboard.fireOnShow();"];
- weakSelf.keyboardIsVisible = YES;
}];
_keyboardHideObserver = [nc addObserverForName:UIKeyboardDidHideNotification
object:nil
queue:[NSOperationQueue mainQueue]
usingBlock:^(NSNotification* notification) {
[weakSelf.commandDelegate evalJs:@"Keyboard.fireOnHide();"];
- weakSelf.keyboardIsVisible = NO;
}];
_keyboardWillShowObserver = [nc addObserverForName:UIKeyboardWillShowNotification
@@ -85,12 +83,14 @@
queue:[NSOperationQueue mainQueue]
usingBlock:^(NSNotification* notification) {
[weakSelf.commandDelegate evalJs:@"Keyboard.fireOnShowing();"];
+ weakSelf.keyboardIsVisible = YES;
}];
_keyboardWillHideObserver = [nc addObserverForName:UIKeyboardWillHideNotification
object:nil
queue:[NSOperationQueue mainQueue]
usingBlock:^(NSNotification* notification) {
[weakSelf.commandDelegate evalJs:@"Keyboard.fireOnHiding();"];
+ weakSelf.keyboardIsVisible = NO;
}];
_shrinkViewKeyboardWillChangeFrameObserver = [nc addObserverForName:UIKeyboardWillChangeFrameNotification
@@ -271,7 +271,7 @@
CGRect keyboard = [self.viewController.view convertRect: ((NSValue*)notif.userInfo[@"UIKeyboardFrameEndUserInfoKey"]).CGRectValue fromView: nil];
CGRect keyboardIntersection = CGRectIntersection(screen, keyboard);
- if(CGRectContainsRect(screen, keyboardIntersection) && !CGRectIsEmpty(keyboardIntersection)&& _shrinkView){
+ if(CGRectContainsRect(screen, keyboardIntersection) && !CGRectIsEmpty(keyboardIntersection) && _shrinkView && self.keyboardIsVisible){
screen.size.height -= MIN(keyboardIntersection.size.height, keyboardIntersection.size.width);
if (_hideFormAccessoryBar){
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org