Merge pull request #566 from ralfvdz/patch-2

Fix URL navigation within modal view controller
facebookarchive · Jul 9, 2011 · a07e9d6 · a07e9d6
2 parents ad32d4d + f266876
commit a07e9d6
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/Three20UINavigator/Sources/TTBaseNavigator.m b/src/Three20UINavigator/Sources/TTBaseNavigator.m
@@ -933,6 +933,16 @@ - (UIViewController*)visibleViewController {
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 - (UIViewController*)topViewController {
   UIViewController* controller = _rootViewController;
+
+  // Modal view controllers are presented (and stacked) from TTRootViewController
+  // Use its modalViewController when available as start to find top view controller
+  if (self.rootContainer != nil) {
+    UIViewController *modalRootController = [self.rootContainer rootViewController];
+    if (modalRootController.modalViewController) {
+      controller = modalRootController.modalViewController;
+    }
+  }
+
   while (controller) {
     UIViewController* child = controller.popupViewController;
     if (!child || ![child canBeTopViewController]) {