From 1f2208d30440a373bdf7fdf3fe37ecd0004905a5 Mon Sep 17 00:00:00 2001
From: djmaze <djmaze@djmaze.lan>
Date: Mon, 19 Jul 2021 14:26:32 +0200
Subject: [PATCH] Cleanup time handling

---
 dev/App/User.js          | 11 ++++++++++-
 dev/Common/Momentor.js   |  6 ------
 dev/Common/Translator.js |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/dev/App/User.js b/dev/App/User.js
index 82f319fa2..b055b043c 100644
--- a/dev/App/User.js
+++ b/dev/App/User.js
@@ -81,6 +81,8 @@ import { ComposePopupView } from 'View/Popup/Compose';
 import { FolderSystemPopupView } from 'View/Popup/FolderSystem';
 import { AskPopupView } from 'View/Popup/Ask';
 
+import { timeToNode } from 'Common/Momentor';
+
 // Every 5 minutes
 const refreshFolders = 300000;
 
@@ -1020,7 +1022,14 @@ class AppUser extends AbstractApp {
 			this.hideLoading();
 		}
 
-		setInterval(() => dispatchEvent(new CustomEvent('reload-time')), 60000);
+		setInterval(this.reloadTime(), 60000);
+	}
+
+	reloadTime()
+	{
+		setTimeout(() =>
+			doc.querySelectorAll('[data-bind*="moment:"]').forEach(element => timeToNode(element))
+			, 1)
 	}
 
 	showMessageComposer(params = [])
diff --git a/dev/Common/Momentor.js b/dev/Common/Momentor.js
index 6da0a88ce..aa6efed35 100644
--- a/dev/Common/Momentor.js
+++ b/dev/Common/Momentor.js
@@ -1,4 +1,3 @@
-import { doc } from 'Common/Globals';
 import { i18n } from 'Common/Translator';
 
 export function timestampToString(timeStampInUTC, formatStr) {
@@ -53,8 +52,3 @@ export function timeToNode(element, time) {
 		console.error(e);
 	}
 }
-
-addEventListener('reload-time', () => setTimeout(() =>
-	doc.querySelectorAll('[data-bind*="moment:"]').forEach(element => timeToNode(element))
-	, 1)
-);
diff --git a/dev/Common/Translator.js b/dev/Common/Translator.js
index ba9728276..dd2d81bb6 100644
--- a/dev/Common/Translator.js
+++ b/dev/Common/Translator.js
@@ -140,7 +140,7 @@ export function reload(admin, language) {
 			// reload the data
 			if (init()) {
 				i18nToNodes(doc);
-				dispatchEvent(new CustomEvent('reload-time'));
+				admin || rl.app.reloadTime();
 				trigger(!trigger());
 			}
 			script.remove();