From: zeripath <art27@cantab.net>
Date: Wed, 7 Apr 2021 23:48:13 +0000 (+0100)
Subject: Fix handling of logout event (#15323)
X-Git-Tag: v1.15.0-rc1~510
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=05b7e328297142c7ddb888339901524708472a3a;p=gitea.git

Fix handling of logout event (#15323)

It appears that there is a slight bug in the handling of the data of logout event -
the javascript should be testing the data field of the data field for the logout
instruction.

Signed-off-by: Andrew Thornton <art27@cantab.net>
---

diff --git a/web_src/js/features/notification.js b/web_src/js/features/notification.js
index fca1ddc543..4fa2d3c29a 100644
--- a/web_src/js/features/notification.js
+++ b/web_src/js/features/notification.js
@@ -66,7 +66,7 @@ export async function initNotificationCount() {
       } else if (event.data.type === 'error') {
         console.error(event.data);
       } else if (event.data.type === 'logout') {
-        if (event.data !== 'here') {
+        if (event.data.data !== 'here') {
           return;
         }
         worker.port.postMessage({
diff --git a/web_src/js/features/stopwatch.js b/web_src/js/features/stopwatch.js
index ed20ca3227..d664f0d5f2 100644
--- a/web_src/js/features/stopwatch.js
+++ b/web_src/js/features/stopwatch.js
@@ -48,7 +48,7 @@ export async function initStopwatch() {
       } else if (event.data.type === 'error') {
         console.error(event.data);
       } else if (event.data.type === 'logout') {
-        if (event.data !== 'here') {
+        if (event.data.data !== 'here') {
           return;
         }
         worker.port.postMessage({