diff options
| author | Илья Гречухин <i.grechuhin@gmail.com> | 2016-11-11 18:22:17 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-11 18:22:17 +0300 |
| commit | 3862329be0a35a2e2130cb12d4fc59dbb3e9198d (patch) | |
| tree | 8b85c25bb4848b910902c430cf2dcba76557c441 | |
| parent | 4472c50d5dc41cf2507d26886e1846e00fe58ffe (diff) | |
| parent | 20e11d57ce183d339d5f496baba6534330e4640f (diff) | |
Merge pull request #4715 from VladiMihaylenko/vm-relpytracking-0.1a
[ios] SafariViewController
| -rw-r--r-- | iphone/Maps/Categories/UIKitCategories.mm | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/iphone/Maps/Categories/UIKitCategories.mm b/iphone/Maps/Categories/UIKitCategories.mm index cd122c63be..5b1cd6a186 100644 --- a/iphone/Maps/Categories/UIKitCategories.mm +++ b/iphone/Maps/Categories/UIKitCategories.mm @@ -290,7 +290,7 @@ - (void)safariViewControllerDidFinish:(SFSafariViewController *)controller { - [self.navigationController popViewControllerAnimated:YES]; + [self.navigationController dismissViewControllerAnimated:YES completion:nil]; } @end @@ -299,14 +299,8 @@ - (void)openUrl:(NSURL *)url { - UIApplication * app = [UIApplication sharedApplication]; - if ([app canOpenURL:url]) - [app openURL:url]; - // TODO(Vlad): Correct implementation of navigation controller's buttons. - /* NSString * scheme = url.scheme; - NSAssert(([scheme isEqualToString:@"http"] || [scheme isEqualToString:@"https"]), @"Incorrect - url's scheme!"); + NSAssert(([scheme isEqualToString:@"http"] || [scheme isEqualToString:@"https"]), @"Incorrect url's scheme!"); if (isIOS8) { UIApplication * app = [UIApplication sharedApplication]; @@ -316,8 +310,7 @@ } SFSafariViewController * svc = [[SFSafariViewController alloc] initWithURL:url]; svc.delegate = self; - [self.navigationController pushViewController:svc animated:YES]; - */ + [self.navigationController presentViewController:svc animated:YES completion:nil]; } @end |