Merge remote-tracking branch 'origin/4.4'

ibexa · Mar 24, 2023 · 69eb128 · 69eb128
2 parents 1a5dc57 + ba7a27f
commit 69eb128
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/bundle/Resources/public/js/scripts/admin.notifications.modal.js b/src/bundle/Resources/public/js/scripts/admin.notifications.modal.js
@@ -58,7 +58,7 @@
             },
         });
 
-        fetch(request)
+        return fetch(request)
             .then(getJsonFromResponse)
             .then((notificationsInfo) => {
                 setPendingNotificationCount(notificationsInfo);
@@ -169,6 +169,11 @@
 
     modal.querySelectorAll(SELECTOR_MODAL_RESULTS).forEach((link) => link.addEventListener('click', handleModalResultsClick, false));
 
-    getNotificationsStatus();
-    global.setInterval(getNotificationsStatus, INTERVAL);
+    const getNotificationsStatusLoop = () => {
+        getNotificationsStatus().finally(() => {
+            global.setTimeout(getNotificationsStatusLoop, INTERVAL);
+        });
+    };
+
+    getNotificationsStatusLoop();
 })(window, window.document, window.ibexa, window.Translator);