瀏覽代碼

network login: fix navigation on iPad

Felix Paul Kühne 10 年之前
父節點
當前提交
a235faa2a4
共有 2 個文件被更改,包括 6 次插入3 次删除
  1. 4 1
      Sources/VLCNetworkLoginViewController.m
  2. 2 2
      Sources/VLCServerListViewController.m

+ 4 - 1
Sources/VLCNetworkLoginViewController.m

@@ -197,7 +197,10 @@
 {
     _activityBackgroundView.hidden = YES;
     [_activityIndicator stopAnimating];
-    [self.navigationController popViewControllerAnimated:YES];
+    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
+        [self.navigationController popViewControllerAnimated:YES];
+    else
+        [self dismissViewControllerAnimated:YES completion:nil];
 }
 
 - (IBAction)saveServer:(id)sender

+ 2 - 2
Sources/VLCServerListViewController.m

@@ -418,7 +418,7 @@
                 [self presentViewController:navCon animated:YES completion:nil];
 
                 if (loginViewController.navigationItem.leftBarButtonItem == nil)
-                    loginViewController.navigationItem.leftBarButtonItem = [UIBarButtonItem themedDarkToolbarButtonWithTitle:NSLocalizedString(@"BUTTON_DONE", nil) target:loginViewController andSelector:@selector(dismissWithAnimation:)];
+                    loginViewController.navigationItem.leftBarButtonItem = [UIBarButtonItem themedDarkToolbarButtonWithTitle:NSLocalizedString(@"BUTTON_DONE", nil) target:loginViewController andSelector:@selector(_dismiss)];
             } else
                 [self.navigationController pushViewController:loginViewController animated:YES];
             break;
@@ -462,7 +462,7 @@
                 [self presentViewController:navCon animated:YES completion:nil];
 
                 if (loginViewController.navigationItem.leftBarButtonItem == nil)
-                    loginViewController.navigationItem.leftBarButtonItem = [UIBarButtonItem themedDarkToolbarButtonWithTitle:NSLocalizedString(@"BUTTON_DONE", nil) target:loginViewController andSelector:@selector(dismissWithAnimation:)];
+                    loginViewController.navigationItem.leftBarButtonItem = [UIBarButtonItem themedDarkToolbarButtonWithTitle:NSLocalizedString(@"BUTTON_DONE", nil) target:loginViewController andSelector:@selector(_dismiss)];
             } else
                 [self.navigationController pushViewController:loginViewController animated:YES];
             loginViewController.hostname = [_ftpServices[row] hostName];