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

Merge pull request #1637 from NativeScript/atanasovg/fix-navigation-clearhistory

Browse Source 
Fixes breaking app on back btn clearHistory: true on android
This commit is contained in:
Hristo Hristov
2016-02-25 17:22:32 +02:00
parent 32080e833e cbbde1b171
commit b3721cc047
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ui/frame/frame.android.ts
View File

@ -238,6 +238,7 @@ export class Frame extends frameCommon.Frame {
} }
let manager = activity.getFragmentManager(); let manager = activity.getFragmentManager();
let isFirstNavigation = types.isNullOrUndefined(this._currentEntry);
// Clear history // Clear history
if (backstackEntry.entry.clearHistory) { if (backstackEntry.entry.clearHistory) {
@ -307,7 +308,6 @@ export class Frame extends frameCommon.Frame {
// remember the fragment tag at page level so that we can retrieve the fragment associated with a Page instance // remember the fragment tag at page level so that we can retrieve the fragment associated with a Page instance
backstackEntry.resolvedPage[TAG] = newFragmentTag; backstackEntry.resolvedPage[TAG] = newFragmentTag;
let isFirstNavigation = types.isNullOrUndefined(this._currentEntry);
if (isFirstNavigation) { if (isFirstNavigation) {
fragmentTransaction.add(this.containerViewId, newFragment, newFragmentTag); fragmentTransaction.add(this.containerViewId, newFragment, newFragmentTag);
trace.write(`fragmentTransaction.add(${newFragmentTag});`, trace.categories.NativeLifecycle); trace.write(`fragmentTransaction.add(${newFragmentTag});`, trace.categories.NativeLifecycle);