javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix navigatedFrom event raised when Activity is destroyed without actual navigation. (#2100)

Browse Source
This commit is contained in:
Hristo Hristov
2016-05-13 13:11:10 +03:00
parent 3fa46f1911
commit d62f018a55
4 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ui/transition/transition.android.ts
View File

@@ -289,6 +289,7 @@ function _completePageAddition(fragment: any, isBack: boolean) {
frame._currentEntry = entry;
page.onNavigatedTo(isBack);
frame._processNavigationQueue(page);
entry.isNavigation = undefined;
trace.write(`ADDITION of ${page} completed`, trace.categories.Transition);
}
@@ -300,7 +301,10 @@ function _completePageRemoval(fragment: any, isBack: boolean) {
var page: pageModule.Page = entry.resolvedPage;
if (page.frame) {
frame._removeView(page);
page.onNavigatedFrom(isBack);
// This could be undefined if activity is destroyed (e.g. without actual navigation).
if (entry.isNavigation) {
page.onNavigatedFrom(isBack);
}
trace.write(`REMOVAL of ${page} completed`, trace.categories.Transition);
}
else {
@@ -317,6 +321,8 @@ function _completePageRemoval(fragment: any, isBack: boolean) {
trace.write(`DETACHMENT of ${page} has already been done`, trace.categories.Transition);
}
}
entry.isNavigation = undefined;
}
function _addNativeTransitionListener(fragment: any, nativeTransition: any/*android.transition.Transition*/) {