Merge pull request #29 from esttorhe/master

[UI Fix] Setting up the initial frame of the textview only when the mana...
hackiftekhar · Mar 11, 2014 · 2509a57 · 2509a57
2 parents 7f7bc52 + 1d29b62
commit 2509a57
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/KeyboardTextFieldDemo/IQKeyBoardManager/IQKeyboardManager.m b/KeyboardTextFieldDemo/IQKeyBoardManager/IQKeyboardManager.m
@@ -603,10 +603,13 @@ -(void)textFieldViewDidEndEditing:(NSNotification*)notification
 {
     [_textFieldView.window removeGestureRecognizer:tapGesture];
 
-    [UIView animateWithDuration:animationDuration delay:0 options:(animationCurve|UIViewAnimationOptionBeginFromCurrentState) animations:^{
-        _textFieldView.frame = textFieldViewIntialFrame;
-    } completion:^(BOOL finished) {
-    }];
+	// We check if there's a valid frame before resetting the textview's frame
+	if(!CGRectEqualToRect(textFieldViewIntialFrame, CGRectZero)){
+		[UIView animateWithDuration:animationDuration delay:0 options:(animationCurve|UIViewAnimationOptionBeginFromCurrentState) animations:^{
+			_textFieldView.frame = textFieldViewIntialFrame;
+		} completion:^(BOOL finished) {
+		}];
+	}
 
     //Setting object to nil
     _textFieldView = nil;
@@ -617,7 +620,8 @@ -(void)textFieldViewDidBeginEditing:(NSNotification*)notification
 {
     //  Getting object
     _textFieldView = notification.object;
-    textFieldViewIntialFrame = _textFieldView.frame;
+	// If the manager is not enabled and it can't adjust the textview set the initial frame to CGRectZero
+    textFieldViewIntialFrame = _enable && _canAdjustTextView ? _textFieldView.frame : CGRectZero;
 
 	//If autoToolbar enable, then add toolbar on all the UITextField/UITextView's if required.
 	if (_enableAutoToolbar)