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

Close current modal page on livesync

Browse Source
This commit is contained in:
Vladimir Enchev
2016-05-31 15:58:18 +03:00
parent 153650fb47
commit 819a45b99a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tns-core-modules/ui/frame/frame-common.ts
View File

@ -39,6 +39,10 @@ function buildEntryFromArgs(arg: any): definition.NavigationEntry {
export function reloadPage(): void { export function reloadPage(): void {
let frame = topmost(); let frame = topmost();
if (frame) { if (frame) {
if (frame.currentPage && (<any>frame.currentPage)._modal) {
(<any>frame.currentPage)._modal.closeModal();
}
let currentEntry = frame._currentEntry.entry; let currentEntry = frame._currentEntry.entry;
let newEntry: definition.NavigationEntry = { let newEntry: definition.NavigationEntry = {
animated: false, animated: false,
@ -317,13 +321,13 @@ export class Frame extends CustomLayoutView implements definition.Frame {
public _goBackCore(backstackEntry: definition.BackstackEntry) { public _goBackCore(backstackEntry: definition.BackstackEntry) {
if (trace.enabled) { if (trace.enabled) {
trace.write(`${this}._goBackCore(${this._backstackEntryTrace(backstackEntry) }); ${this}.currentPage: ${this.currentPage}`, trace.categories.Navigation); trace.write(`${this}._goBackCore(${this._backstackEntryTrace(backstackEntry)}); ${this}.currentPage: ${this.currentPage}`, trace.categories.Navigation);
} }
} }
public _navigateCore(backstackEntry: definition.BackstackEntry) { public _navigateCore(backstackEntry: definition.BackstackEntry) {
if (trace.enabled) { if (trace.enabled) {
trace.write(`${this}._navigateCore(${this._backstackEntryTrace(backstackEntry) }); ${this}.currentPage: ${this.currentPage}`, trace.categories.Navigation); trace.write(`${this}._navigateCore(${this._backstackEntryTrace(backstackEntry)}); ${this}.currentPage: ${this.currentPage}`, trace.categories.Navigation);
} }
} }