Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Fix __IPHONE_OS_VERSION_{MIN_REQUIRED,MAX_ALLOWED} mixup in SSWebViewController #173

Merged
merged 1 commit into from

2 participants

@a2
a2 commented

No description provided.

@a2 a2 Fix __IPHONE_OS_VERSION_{MIN_REQUIRED,MAX_ALLOWED} mixup in SSWebView…
…Controller

Signed-off-by: Alexsander Akers <a2@pandamonia.us>
89354d1
@a2
a2 commented

My bad. :)

@calebd

Thanks for the quick fix!

@calebd calebd merged commit 87d3f4d into soffes:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 25, 2013
  1. @a2

    Fix __IPHONE_OS_VERSION_{MIN_REQUIRED,MAX_ALLOWED} mixup in SSWebView…

    a2 authored
    …Controller
    
    Signed-off-by: Alexsander Akers <a2@pandamonia.us>
This page is out of date. Refresh to see the latest.
Showing with 6 additions and 7 deletions.
  1. +6 −7 SSToolkit/SSWebViewController.m
View
13 SSToolkit/SSWebViewController.m
@@ -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
}
@@ -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
}
@@ -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
}
Something went wrong with that request. Please try again.