Merge pull request #3119 from vishalduggal/timob-11250-21X

[TIMOB-11250](2_1_X)Fix incorrect focus on tableview data reload
tidev · Oct 5, 2012 · 61edac4 · 61edac4
2 parents dd5031d + 4017973
commit 61edac4
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/iphone/Classes/TiUITableView.m b/iphone/Classes/TiUITableView.m
@@ -598,6 +598,7 @@ -(void)dispatchAction:(TiUITableViewAction*)action
     BOOL reloadSearch = NO;
 
 	TiViewProxy<TiKeyboardFocusableView> * chosenField = [[[TiApp controller] keyboardFocusedProxy] retain];
+	BOOL hasFocus = [chosenField focused];
 	BOOL oldSuppress = [chosenField suppressFocusEvents];
 	[chosenField setSuppressFocusEvents:YES];
 	switch (action.type)
@@ -768,7 +769,10 @@ -(void)dispatchAction:(TiUITableViewAction*)action
             break;
         }
 	}
-	[chosenField focus:nil];
+	if (hasFocus) {
+		[chosenField focus:nil];
+	}
+
 	[chosenField setSuppressFocusEvents:oldSuppress];
 	[chosenField release];