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

fix(ios): can not show fullscreen modal windows anymore #11267

Merged
merged 9 commits into from
Oct 14, 2019
Merged

fix(ios): can not show fullscreen modal windows anymore #11267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5be9829
fix(ios): can not show fullscreen modal windows anymore
vijaysingh-axway Oct 8, 2019
c4b275d
fix(ios): can not show fullscreen modal windows anymore
vijaysingh-axway Oct 9, 2019
83d668c
fix(ios): can not show fullscreen modal windows anymore
vijaysingh-axway Oct 10, 2019
e236a38
Merge branch 'master' into TIMOb-27453
Oct 10, 2019
84dd00d
fix(ios): can not show fullscreen modal windows anymore
vijaysingh-axway Oct 10, 2019
701f153
Merge branch 'master' into TIMOb-27453
Oct 10, 2019
993be1e
fix(ios): can not show fullscreen modal windows anymore
vijaysingh-axway Oct 11, 2019
8d77f19
Merge branch 'master' into TIMOb-27453
Oct 11, 2019
d479081
Merge branch 'master' into TIMOb-27453
sgtcoolguy Oct 14, 2019
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
5 changes: 5 additions & 0 deletions iphone/TitaniumKit/TitaniumKit/Sources/API/TiRootViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#import "TiLayoutQueue.h"
#import "TiSharedConfig.h"
#import "TiUtils.h"
#import "TiViewController.h"

#ifdef FORCE_WITH_MODAL
@interface ForcingController : UIViewController {
Expand Down Expand Up @@ -824,6 +825,10 @@ - (void)showControllerModal:(UIViewController *)theController animated:(BOOL)ani
}
}
[self dismissKeyboard];
if ([theController isKindOfClass:[TiViewController class]]) {
TiViewController *controller = (TiViewController *)theController;
controller.presentationController.delegate = controller;
}
[topVC presentViewController:theController animated:trulyAnimated completion:nil];
}

Expand Down
1 change: 0 additions & 1 deletion iphone/TitaniumKit/TitaniumKit/Sources/API/TiViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ - (id)initWithViewProxy:(TiViewProxy *)window
{
if (self = [super init]) {
_proxy = window;
self.presentationController.delegate = self;
[self updateOrientations];
[TiUtils configureController:self withObject:_proxy];
}
Expand Down
6 changes: 3 additions & 3 deletions iphone/TitaniumKit/TitaniumKit/Sources/API/TiWindowProxy.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,12 +553,12 @@ - (void)openOnUIThread:(NSArray *)args
if (style != -1) {
[theController setModalTransitionStyle:style];
}
style = [TiUtils intValue:@"modalStyle" properties:dict def:-1];
if (style != -1) {
UIModalPresentationStyle modalStyle = [TiUtils intValue:@"modalStyle" properties:dict def:-1];
if (modalStyle != -1) {
// modal transition style page curl must be done only in fullscreen
// so only allow if not page curl
if ([theController modalTransitionStyle] != UIModalTransitionStylePartialCurl) {
[theController setModalPresentationStyle:style];
[theController setModalPresentationStyle:modalStyle];
}
}

Expand Down