Merge pull request #33 from Soph/develop

fixed warning "dismissModalViewControllerAnimated is deprecated"
This commit is contained in:
Andreas Linde 2013-02-20 04:46:20 -08:00
commit abfc1ed3a5
2 changed files with 6 additions and 6 deletions

View File

@ -222,7 +222,7 @@
if (self.delegate && [self.delegate respondsToSelector:@selector(feedbackComposeViewControllerDidFinish:)]) {
[self.delegate feedbackComposeViewControllerDidFinish:self];
} else {
[self dismissModalViewControllerAnimated:YES];
[self dismissViewControllerAnimated:YES completion:nil];
}
}
@ -263,21 +263,21 @@
if ([self.navigationController respondsToSelector:@selector(dismissViewControllerAnimated:completion:)]) {
[self.navigationController dismissViewControllerAnimated:YES
completion:^(void) {
[self dismissModalViewControllerAnimated:YES];
[self dismissViewControllerAnimated:YES completion:nil];
}];
} else {
[self dismissModalViewControllerAnimated:YES];
[self dismissViewControllerAnimated:YES completion:nil];
[self performSelector:@selector(dismissAction:) withObject:nil afterDelay:0.4];
}
} else {
[self.navigationController dismissModalViewControllerAnimated:YES];
[self.navigationController dismissViewControllerAnimated:YES completion:nil];
}
}
- (void)userDataUpdateFinished {
[self.manager saveMessages];
[self.navigationController dismissModalViewControllerAnimated:YES];
[self.navigationController dismissViewControllerAnimated:YES completion:nil];
}

View File

@ -50,7 +50,7 @@
// If there is no presenting view controller just remove view
if (presentingViewController && self.modalAnimated) {
[presentingViewController dismissModalViewControllerAnimated:YES];
[presentingViewController dismissViewControllerAnimated:YES completion:nil];
} else {
[self.navigationController.view removeFromSuperview];
}