Merge remote-tracking branch 'origin/master'

hackiftekhar · Jun 4, 2015 · 9e70b52 · 9e70b52
2 parents 6f29297 + 5d4d33f
commit 9e70b52
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/IQKeyBoardManager/Categories/IQUIView+Hierarchy.m b/IQKeyBoardManager/Categories/IQUIView+Hierarchy.m
@@ -95,7 +95,10 @@ -(UIViewController *)topMostController
 
     UIViewController *topController = self.window.rootViewController;
 
-    [controllersHierarchy addObject:topController];
+    if (topController)
+    {
+        [controllersHierarchy addObject:topController];
+    }
 
     while ([topController presentedViewController]) {
 

diff --git a/IQKeyBoardManager/IQKeyboardManager.m b/IQKeyBoardManager/IQKeyboardManager.m
@@ -1130,6 +1130,13 @@ -(void)textFieldViewDidBeginEditing:(NSNotification*)notification
             [UIView animateWithDuration:0.00001 delay:0 options:(_animationCurve|UIViewAnimationOptionBeginFromCurrentState) animations:^{
                 [self addToolbarIfRequired];
             } completion:^(BOOL finished) {
+
+                //RestoringTextView before reloading inputViews
+                if (_keyboardManagerFlags.isTextFieldViewFrameChanged)
+                {
+                    _keyboardManagerFlags.isTextFieldViewFrameChanged = NO;
+                    _textFieldView.frame = _textFieldViewIntialFrame;
+                }
 
                 //On textView toolbar didn't appear on first time, so forcing textView to reload it's inputViews.
                 [_textFieldView reloadInputViews];

diff --git a/IQKeybordManagerSwift/Categories/IQNSArray+Sort.swift b/IQKeybordManagerSwift/Categories/IQNSArray+Sort.swift
@@ -22,6 +22,7 @@
 // THE SOFTWARE.
 
 import Foundation
+import UIKit
 
 /**
 UIView.subviews sorting category.

diff --git a/IQKeybordManagerSwift/IQKeyboardManager.swift b/IQKeybordManagerSwift/IQKeyboardManager.swift
@@ -705,7 +705,7 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
                 self._IQShowLog("Set \(controller?._IQDescription()) frame to : \(frame)")
 
                 //Animating content if needed (Bug ID: #204)
-                if layoutIfNeededOnUpdate == true {
+                if self.layoutIfNeededOnUpdate == true {
                     //Animating content (Bug ID: #160)
                     unwrappedController.view.setNeedsLayout()
                     unwrappedController.view.layoutIfNeeded()
@@ -1339,7 +1339,7 @@ class IQKeyboardManager: NSObject, UIGestureRecognizerDelegate {
                     rootViewController.view.frame = self._topViewBeginRect
 
                     //Animating content if needed (Bug ID: #204)
-                    if layoutIfNeededOnUpdate == true {
+                    if self.layoutIfNeededOnUpdate == true {
                         //Animating content (Bug ID: #160)
                         rootViewController.view.setNeedsLayout()
                         rootViewController.view.layoutIfNeeded()