Skip to content
This repository has been archived by the owner on Feb 16, 2019. It is now read-only.

Commit

Permalink
Fix __IPHONE_OS_VERSION_{MIN_REQUIRED,MAX_ALLOWED} mixup in SSWebView…
Browse files Browse the repository at this point in the history
…Controller

Signed-off-by: Alexsander Akers <a2@pandamonia.us>
  • Loading branch information
a2 committed Mar 25, 2013
1 parent 4c32fb7 commit 89354d1
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions SSToolkit/SSWebViewController.m
Expand Up @@ -144,14 +144,13 @@ - (NSURL *)currentURL {
#pragma mark - Actions

- (void)close:(id)sender {
#if __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_5_0
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_5_0
if ([self.navigationController respondsToSelector:@selector(dismissViewControllerAnimated:completion:)])
{
[self.navigationController dismissViewControllerAnimated:YES completion:nil];
return;
}
#endif
#if __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_6_0
#if __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_6_0
[self.navigationController dismissModalViewControllerAnimated:YES];
#endif
}
Expand Down Expand Up @@ -191,14 +190,14 @@ - (void)emailURL:(id)sender {
viewController.mailComposeDelegate = self;
[viewController setMessageBody:_webView.lastRequest.mainDocumentURL.absoluteString isHTML:NO];

#if __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_5_0
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_5_0
if ([self.navigationController respondsToSelector:@selector(presentViewController:animated:completion:)])
{
[self.navigationController presentViewController:viewController animated:YES completion:nil];
return;
}
#endif
#if __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_6_0
#if __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_6_0
[self.navigationController presentModalViewController:viewController animated:YES];
#endif
}
Expand Down Expand Up @@ -274,14 +273,14 @@ - (void)actionSheet:(UIActionSheet *)actionSheet didDismissWithButtonIndex:(NSIn
#pragma mark - MFMailComposeViewControllerDelegate

- (void)mailComposeController:(MFMailComposeViewController *)controller didFinishWithResult:(MFMailComposeResult)result error:(NSError *)error {
#if __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_5_0
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_5_0
if ([controller respondsToSelector:@selector(dismissViewControllerAnimated:completion:)])
{
[controller dismissViewControllerAnimated:YES completion:nil];
return;
}
#endif
#if __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_6_0
#if __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_6_0
[controller dismissModalViewControllerAnimated:YES];
#endif
}
Expand Down

0 comments on commit 89354d1

Please sign in to comment.