skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Fix link opening and popup dismissal bugs.

Browse Source
This commit is contained in:
Maarten Billemont 2014-06-03 23:58:16 -04:00
parent 74e8001506
commit c3364bbbef
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MasterPassword/ObjC/iOS/MPNavigationController.m
View File

@ -24,7 +24,7 @@
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
if ([segue.identifier isEqualToString:@"web"])
((MPWebViewController *)segue.destinationViewController).initialURL = [NSURL URLWithString:@"http://thanks.lhunath.com"];
((MPWebViewController *)segue.destinationViewController).initialURL = sender;
}
@end

9
MasterPassword/ObjC/iOS/MPPopdownSegue.m
View File

@ -40,8 +40,7 @@
[UIView animateWithDuration:0.3f animations:^{
[passwordsVC.popdownToTopConstraint layoutWithPriority:1];
} completion:^(BOOL finished) {
if (finished)
[popdownVC didMoveToParentViewController:passwordsVC];
[popdownVC didMoveToParentViewController:passwordsVC];
}];
}
else if ([self.destinationViewController isKindOfClass:[MPPasswordsViewController class]]) {
@ -52,10 +51,8 @@
[UIView animateWithDuration:0.3f delay:0 options:UIViewAnimationOptionOverrideInheritedDuration animations:^{
[passwordsVC.popdownToTopConstraint layoutWithPriority:UILayoutPriorityDefaultHigh];
} completion:^(BOOL finished) {
if (finished) {
[popdownVC.view removeFromSuperview];
[popdownVC removeFromParentViewController];
}
[popdownVC.view removeFromSuperview];
[popdownVC removeFromParentViewController];
}];
}
}