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): Set transitionIsAnimating while pushing the controller rather waiting for delegate #10535

Merged
merged 7 commits into from
Dec 19, 2018
Merged

fix(ios): Set transitionIsAnimating while pushing the controller rather waiting for delegate #10535

Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2b9ffdd
fix(ios): Set transitionIsAnimating while pushing the controller rath…
vijaysingh-axway Dec 13, 2018
3593966
Merge branch 'master' into TIMOB-26641
janvennemann Dec 13, 2018
da079e9
fix(ios): Block the pop of view controller if its already in transition
vijaysingh-axway Dec 17, 2018
2dabcd3
Merge branch 'master' into TIMOB-26641
longton95 Dec 18, 2018
e719101
Merge branch 'master' into TIMOB-26641
lokeshchdhry Dec 18, 2018
311d4a2
Merge branch 'master' into TIMOB-26641
ssjsamir Dec 19, 2018
e6ab1a9
Merge branch 'master' into TIMOB-26641
ssjsamir Dec 19, 2018
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
6 changes: 6 additions & 0 deletions iphone/Classes/TiUINavigationWindowProxy.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,9 @@ - (void)pushOnUIThread:(NSArray *)args
[self performSelector:_cmd withObject:args afterDelay:0.1];
return;
}
if (!transitionWithGesture) {
transitionIsAnimating = YES;
}
TiWindowProxy *window = [args objectAtIndex:0];
BOOL animated = args != nil && [args count] > 1 ? [TiUtils boolValue:@"animated" properties:[args objectAtIndex:1] def:YES] : YES;

Expand All @@ -289,6 +292,9 @@ - (void)popOnUIThread:(NSArray *)args

if (window == current) {
BOOL animated = args != nil && [args count] > 1 ? [TiUtils boolValue:@"animated" properties:[args objectAtIndex:1] def:YES] : YES;
if (animated && !transitionWithGesture) {
transitionIsAnimating = YES;
}
[navController popViewControllerAnimated:animated];
} else {
[self closeWindow:window animated:NO];
Expand Down