Merge branch 'master' into ios7
This commit is contained in:
commit
c7f04f8449
@ -51,10 +51,9 @@
|
|||||||
options:nil];
|
options:nil];
|
||||||
self.pageViewController.dataSource = self;
|
self.pageViewController.dataSource = self;
|
||||||
self.pageViewController.delegate = self;
|
self.pageViewController.delegate = self;
|
||||||
|
self.pageViewController.view.frame = CGRectFromOriginWithSize( CGPointZero, self.pagePositionView.bounds.size );
|
||||||
[self addChildViewController:self.pageViewController];
|
[self addChildViewController:self.pageViewController];
|
||||||
[self.view addSubview:self.pageViewController.view];
|
[self.pagePositionView addSubview:self.pageViewController.view];
|
||||||
self.pageViewController.view.frame = self.pagePositionView.frame;
|
|
||||||
[self.pagePositionView removeFromSuperview];
|
|
||||||
[self.pageViewController didMoveToParentViewController:self];
|
[self.pageViewController didMoveToParentViewController:self];
|
||||||
|
|
||||||
[super viewDidLoad];
|
[super viewDidLoad];
|
||||||
|
@ -120,6 +120,9 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
- (void)viewWillAppear:(BOOL)animated {
|
- (void)viewWillAppear:(BOOL)animated {
|
||||||
|
|
||||||
|
[[UIApplication sharedApplication] setStatusBarHidden:NO withAnimation:UIStatusBarAnimationSlide];
|
||||||
|
[self.navigationController setNavigationBarHidden:NO animated:animated];
|
||||||
|
|
||||||
MPElementEntity *activeElement = [self activeElementForMainThread];
|
MPElementEntity *activeElement = [self activeElementForMainThread];
|
||||||
if (activeElement.user != [[MPiOSAppDelegate get] activeUserForMainThread])
|
if (activeElement.user != [[MPiOSAppDelegate get] activeUserForMainThread])
|
||||||
|
@ -188,7 +188,7 @@
|
|||||||
self.uiContainer.alpha = 1;
|
self.uiContainer.alpha = 1;
|
||||||
}];
|
}];
|
||||||
|
|
||||||
NSString *newsURL = PearlString( @"http://masterpasswordapp.com/news-dev.html?version=%@",
|
NSString *newsURL = PearlString( @"http://masterpasswordapp.com/news.html?version=%@",
|
||||||
[[PearlInfoPlist get] CFBundleVersion] );
|
[[PearlInfoPlist get] CFBundleVersion] );
|
||||||
[self.newsView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:newsURL]]];
|
[self.newsView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:newsURL]]];
|
||||||
}];
|
}];
|
||||||
@ -245,11 +245,6 @@
|
|||||||
|
|
||||||
[self.marqueeTipTimer invalidate];
|
[self.marqueeTipTimer invalidate];
|
||||||
|
|
||||||
[[UIApplication sharedApplication] setStatusBarHidden:NO withAnimation:UIStatusBarAnimationSlide];
|
|
||||||
[[NSOperationQueue mainQueue] addOperationWithBlock:^{
|
|
||||||
[self.navigationController setNavigationBarHidden:NO animated:animated];
|
|
||||||
}];
|
|
||||||
|
|
||||||
[super viewWillDisappear:animated];
|
[super viewWillDisappear:animated];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -16,6 +16,6 @@
|
|||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<p><a href="mailto:masterpassword@lyndir.com">E-mail us</a> or open <a href="http://masterpasswordapp.com/support.html">support</a> if you have any issues.</p>
|
<p></p>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
Loading…
Reference in New Issue
Block a user