Skip to content

fix(android): parallel navigations should not be triggered #6275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
manoldonev merged 1 commit into from
Sep 18, 2018
Merged

fix(android): parallel navigations should not be triggered #6275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tns-core-modules/ui/core/view/view.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ export class View extends ViewCommon {

public getLocationRelativeTo(otherView: ViewCommon): Point {
if (!this.nativeViewProtected || !this.nativeViewProtected.getWindowToken() ||
!otherView.nativeViewProtected || !otherView.nativeViewProtected.getWindowToken() ||
!otherView || !otherView.nativeViewProtected || !otherView.nativeViewProtected.getWindowToken() ||
this.nativeViewProtected.getWindowToken() !== otherView.nativeViewProtected.getWindowToken()) {
return undefined;
}
Expand Down
2 changes: 1 addition & 1 deletion tns-core-modules/ui/frame/frame.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export class Frame extends FrameBase {
// In this case call _navigateCore in order to recreate the current fragment.
// Don't call navigate because it will fire navigation events.
// 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;
}

Expand Down