Merge pull request #6417 from vishalduggal/timob-18075

[TIMOB-18075] Restore Focus to top WindowProxy
tidev · Dec 3, 2014 · b54e6bf · b54e6bf
2 parents 64cc338 + dccfb5c
commit b54e6bf
Showing 1 changed file with 21 additions and 2 deletions.
diff --git a/iphone/Classes/TiRootViewController.m b/iphone/Classes/TiRootViewController.m
@@ -1137,11 +1137,30 @@ - (BOOL)shouldAutorotate{
 
 -(void)incrementActiveAlertControllerCount
 {
-    ++activeAlertControllerCount;
+    if ([TiUtils isIOS8OrGreater]){
+        ++activeAlertControllerCount;
+    }
 }
 -(void)decrementActiveAlertControllerCount
 {
-    --activeAlertControllerCount;
+    if ([TiUtils isIOS8OrGreater]) {
+        --activeAlertControllerCount;
+        if (activeAlertControllerCount == 0) {
+            UIViewController* topVC = [self topPresentedController];
+            if (topVC == self) {
+                [self didCloseWindow:nil];
+            } else {
+                [self dismissKeyboard];
+
+                if ([topVC respondsToSelector:@selector(proxy)]) {
+                    id theProxy = [(id)topVC proxy];
+                    if ([theProxy conformsToProtocol:@protocol(TiWindowProtocol)]) {
+                        [(id<TiWindowProtocol>)theProxy gainFocus];
+                    }
+                }
+            }
+        }
+    }
 }
 
 -(NSUInteger)supportedOrientationsForAppDelegate;