diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2024-04-30 23:35:42 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-30 15:35:42 +0000 |
| commit | a988237eb43fe0b68465c4c965f869b51d0c60ea (patch) | |
| tree | 158c47554fa8bb10bc526b6ae82f9526316a6f1a /web_src | |
| parent | 564102ce89f53d6bd2fdbaa33416e4287d6fe9a8 (diff) | |
| download | gitea-a988237eb43fe0b68465c4c965f869b51d0c60ea.tar.gz gitea-a988237eb43fe0b68465c4c965f869b51d0c60ea.zip | |
Improve logout from worker (#30775)
A quick fix for #30756
Diffstat (limited to 'web_src')
| -rw-r--r-- | web_src/js/features/notification.js | 3 | ||||
| -rw-r--r-- | web_src/js/features/stopwatch.js | 3 | ||||
| -rw-r--r-- | web_src/js/modules/worker.js | 9 |
3 files changed, 13 insertions, 2 deletions
diff --git a/web_src/js/features/notification.js b/web_src/js/features/notification.js index 2de640e674..8e5a1f83db 100644 --- a/web_src/js/features/notification.js +++ b/web_src/js/features/notification.js @@ -1,6 +1,7 @@ import $ from 'jquery'; import {GET} from '../modules/fetch.js'; import {toggleElem} from '../utils/dom.js'; +import {logoutFromWorker} from '../modules/worker.js'; const {appSubUrl, notificationSettings, assetVersionEncoded} = window.config; let notificationSequenceNumber = 0; @@ -95,7 +96,7 @@ export function initNotificationCount() { type: 'close', }); worker.port.close(); - window.location.href = `${appSubUrl}/`; + logoutFromWorker(); } else if (event.data.type === 'close') { worker.port.postMessage({ type: 'close', diff --git a/web_src/js/features/stopwatch.js b/web_src/js/features/stopwatch.js index bcea26bd6e..79d9892b74 100644 --- a/web_src/js/features/stopwatch.js +++ b/web_src/js/features/stopwatch.js @@ -1,6 +1,7 @@ import {createTippy} from '../modules/tippy.js'; import {GET} from '../modules/fetch.js'; import {hideElem, showElem} from '../utils/dom.js'; +import {logoutFromWorker} from '../modules/worker.js'; const {appSubUrl, notificationSettings, enableTimeTracking, assetVersionEncoded} = window.config; @@ -77,7 +78,7 @@ export function initStopwatch() { type: 'close', }); worker.port.close(); - window.location.href = `${appSubUrl}/`; + logoutFromWorker(); } else if (event.data.type === 'close') { worker.port.postMessage({ type: 'close', diff --git a/web_src/js/modules/worker.js b/web_src/js/modules/worker.js new file mode 100644 index 0000000000..ef3f1dea48 --- /dev/null +++ b/web_src/js/modules/worker.js @@ -0,0 +1,9 @@ +import {sleep} from '../utils.js'; + +const {appSubUrl} = window.config; + +export async function logoutFromWorker() { + // wait for a while because other requests (eg: logout) may be in the flight + await sleep(5000); + window.location.href = `${appSubUrl}/`; +} |