mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Fix error dialog history

Browse source
This commit is contained in:
Dmitry Lyzo 2021-10-03 21:51:06 +03:00
parent 2af0b91dad
commit 3567b9783d
4 changed files with 41 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/components/appRouter.js
View file

@ -24,6 +24,7 @@ class AppRouter {
isDummyBackToHome;
msgTimeout;
popstateOccurred = false;
promiseShow;
resolveOnNextShow;
previousRoute = {};
/**
@ -122,11 +123,24 @@ class AppRouter {
}
}
back() {
page.back();
ready() {
return this.promiseShow || Promise.resolve();
}
show(path, options) {
async back() {
if (this.promiseShow) await this.promiseShow;
this.promiseShow = new Promise((resolve) => {
this.resolveOnNextShow = resolve;
page.back();
});
return this.promiseShow;
}
async show(path, options) {
if (this.promiseShow) await this.promiseShow;
// ensure the path does not start with '#!' since the router adds this
if (path.startsWith('#!')) {
path = path.substring(2);
@ -146,17 +160,25 @@ class AppRouter {
}
}
return new Promise((resolve) => {
this.promiseShow = new Promise((resolve) => {
this.resolveOnNextShow = resolve;
page.show(path, options);
// Schedule a call to return the promise
setTimeout(() => page.show(path, options), 0);
});
return this.promiseShow;
}
showDirect(path) {
return new Promise(function(resolve) {
async showDirect(path) {
if (this.promiseShow) await this.promiseShow;
this.promiseShow = new Promise((resolve) => {
this.resolveOnNextShow = resolve;
page.show(this.baseUrl() + path);
// Schedule a call to return the promise
setTimeout(() => page.show(this.baseUrl() + path), 0);
});
return this.promiseShow;
}
start(options) {
@ -414,6 +436,7 @@ class AppRouter {
onViewShow() {
const resolve = this.resolveOnNextShow;
if (resolve) {
this.promiseShow = null;
this.resolveOnNextShow = null;
resolve();
}