Merge pull request pokeb#295 from gcox/master

jogu · jogu · commit 9d0776869bc8 · 2012-01-13T03:40:11.000-08:00
Fixed bug preventing ASIAuthenticationDialog from being dismissed on iOS5
diff --git a/Classes/ASIAuthenticationDialog.m b/Classes/ASIAuthenticationDialog.m
@@ -216,7 +216,10 @@ - (UITextField *)domainField
 
 + (void)dismiss
 {
-	[[sharedDialog parentViewController] dismissModalViewControllerAnimated:YES];
+	if ([sharedDialog respondsToSelector:@selector(presentingViewController)])
+		[[sharedDialog presentingViewController] dismissModalViewControllerAnimated:YES];
+	else 
+		[[sharedDialog parentViewController] dismissModalViewControllerAnimated:YES];
 }
 
 - (void)viewDidDisappear:(BOOL)animated
@@ -233,7 +236,10 @@ - (void)dismiss
 	if (self == sharedDialog) {
 		[[self class] dismiss];
 	} else {
-		[[self parentViewController] dismissModalViewControllerAnimated:YES];
+		if ([self respondsToSelector:@selector(presentingViewController)])
+			[[self presentingViewController] dismissModalViewControllerAnimated:YES];
+		else
+			[[self parentViewController] dismissModalViewControllerAnimated:YES];
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,10 @@ - (UITextField *)domainField`
`216`	`216`
`217`	`217`	`+ (void)dismiss`
`218`	`218`	`{`
`219`		`- [[sharedDialog parentViewController] dismissModalViewControllerAnimated:YES];`
	`219`	`+ if ([sharedDialog respondsToSelector:@selector(presentingViewController)])`
	`220`	`+ [[sharedDialog presentingViewController] dismissModalViewControllerAnimated:YES];`
	`221`	`+ else`
	`222`	`+ [[sharedDialog parentViewController] dismissModalViewControllerAnimated:YES];`
`220`	`223`	`}`
`221`	`224`
`222`	`225`	`- (void)viewDidDisappear:(BOOL)animated`
`@@ -233,7 +236,10 @@ - (void)dismiss`
`233`	`236`	`if (self == sharedDialog) {`
`234`	`237`	`[[self class] dismiss];`
`235`	`238`	`} else {`
`236`		`- [[self parentViewController] dismissModalViewControllerAnimated:YES];`
	`239`	`+ if ([self respondsToSelector:@selector(presentingViewController)])`
	`240`	`+ [[self presentingViewController] dismissModalViewControllerAnimated:YES];`
	`241`	`+ else`
	`242`	`+ [[self parentViewController] dismissModalViewControllerAnimated:YES];`
`237`	`243`	`}`
`238`	`244`	`}`
`239`	`245`