javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 03:31:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Going back with the stock "Back" button on iOS will now respect the animated setting used when coming to the current page

Browse Source 
Fixes #1787
This commit is contained in:
Rossen Hristov
2016-03-17 17:08:39 +02:00
parent 09304b4345
commit 6de1afc2a9
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ui/frame/frame.ios.ts
View File

@ -70,9 +70,15 @@ export class Frame extends frameCommon.Frame {
navDepth++; navDepth++;
var animated = this.currentPage ? this._getIsAnimatedNavigation(backstackEntry.entry) : false; var animated = this.currentPage ? this._getIsAnimatedNavigation(backstackEntry.entry) : false;
var navigationTransition = this._getNavigationTransition(backstackEntry.entry); if (animated) {
if (animated && navigationTransition) { var navigationTransition = this._getNavigationTransition(backstackEntry.entry);
viewController[TRANSITION] = navigationTransition; if (navigationTransition) {
viewController[TRANSITION] = navigationTransition;
}
}
else {
//https://github.com/NativeScript/NativeScript/issues/1787
viewController[TRANSITION] = { name: "non-animated" };
} }
backstackEntry[NAV_DEPTH] = navDepth; backstackEntry[NAV_DEPTH] = navDepth;
@ -551,6 +557,11 @@ class UINavigationControllerImpl extends UINavigationController implements UINav
return super.popViewControllerAnimated(animated); return super.popViewControllerAnimated(animated);
} }
if (navigationTransition.name === "non-animated") {
//https://github.com/NativeScript/NativeScript/issues/1787
return super.popViewControllerAnimated(false);
}
var nativeTransition = _getNativeTransition(navigationTransition, false); var nativeTransition = _getNativeTransition(navigationTransition, false);
if (!nativeTransition) { if (!nativeTransition) {
return super.popViewControllerAnimated(animated); return super.popViewControllerAnimated(animated);
@ -579,6 +590,11 @@ class UINavigationControllerImpl extends UINavigationController implements UINav
return super.popToViewControllerAnimated(viewController, animated); return super.popToViewControllerAnimated(viewController, animated);
} }
if (navigationTransition.name === "non-animated") {
//https://github.com/NativeScript/NativeScript/issues/1787
return super.popToViewControllerAnimated(viewController, false);
}
var nativeTransition = _getNativeTransition(navigationTransition, false); var nativeTransition = _getNativeTransition(navigationTransition, false);
if (!nativeTransition) { if (!nativeTransition) {
return super.popToViewControllerAnimated(viewController, animated); return super.popToViewControllerAnimated(viewController, animated);