Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TIMOB-17738] (3_4_X) Do not force show popover on ios8 #6170

Merged
merged 1 commit into from
Sep 25, 2014
Merged

[TIMOB-17738] (3_4_X) Do not force show popover on ios8 #6170

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 6 additions & 3 deletions iphone/Classes/MGSplitView/MGSplitViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,13 +607,16 @@ - (void)reconfigureForMasterInPopover:(BOOL)inPopover

} else if (!inPopover && _hiddenPopoverController && _barButtonItem) {
// I know this looks strange, but it fixes a bizarre issue with UIPopoverController leaving masterViewController's views in disarray.
if ([[self view] window] != nil)
{
BOOL forceShow = ([TiUtils isIOS8OrGreater] ? NO : ([[self view] window] != nil));

if (forceShow) {
[_hiddenPopoverController presentPopoverFromRect:CGRectMake(0,0,1,1) inView:self.view permittedArrowDirections:UIPopoverArrowDirectionAny animated:NO];
}

// Remove master from popover and destroy popover, if it exists.
[_hiddenPopoverController dismissPopoverAnimated:NO];
if ([_hiddenPopoverController isPopoverVisible]) {
[_hiddenPopoverController dismissPopoverAnimated:NO];
}
[_hiddenPopoverController release];
_hiddenPopoverController = nil;

Expand Down