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(android): parallel navigations should not be triggered (#6275)

Browse Source
This commit is contained in:
Manol Donev
2018-09-18 11:25:31 +03:00
committed by Manol Donev
parent 5d16749d79
commit 405ccae80c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tns-core-modules/ui/core/view/view.android.ts
View File

@@ -497,7 +497,7 @@ export class View extends ViewCommon {
public getLocationRelativeTo(otherView: ViewCommon): Point { public getLocationRelativeTo(otherView: ViewCommon): Point {
if (!this.nativeViewProtected || !this.nativeViewProtected.getWindowToken() || if (!this.nativeViewProtected || !this.nativeViewProtected.getWindowToken() ||
!otherView.nativeViewProtected || !otherView.nativeViewProtected.getWindowToken() || !otherView || !otherView.nativeViewProtected || !otherView.nativeViewProtected.getWindowToken() ||
this.nativeViewProtected.getWindowToken() !== otherView.nativeViewProtected.getWindowToken()) { this.nativeViewProtected.getWindowToken() !== otherView.nativeViewProtected.getWindowToken()) {
return undefined; return undefined;
} }

2
tns-core-modules/ui/frame/frame.android.ts
View File

@@ -143,7 +143,7 @@ export class Frame extends FrameBase {
// In this case call _navigateCore in order to recreate the current fragment. // In this case call _navigateCore in order to recreate the current fragment.
// Don't call navigate because it will fire navigation events. // Don't call navigate because it will fire navigation events.
// As JS instances are alive it is already done for the current page. // As JS instances are alive it is already done for the current page.
if (!this.isLoaded || !this._attachedToWindow) { if (!this.isLoaded || this._executingEntry || !this._attachedToWindow) {
return; return;
} }