From aaaf1f660c2e999530f5980c4c87de905d36a46e Mon Sep 17 00:00:00 2001
From: buxxi <buxxi@omfilm.net>
Date: Sat, 16 Jan 2021 12:26:38 +0100
Subject: [PATCH] refactoring newsfeed, moving hiding of module while loading
 away from dom-generation

---
 modules/default/newsfeed/newsfeed.js | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/modules/default/newsfeed/newsfeed.js b/modules/default/newsfeed/newsfeed.js
index 0659876b..bcd91c8e 100644
--- a/modules/default/newsfeed/newsfeed.js
+++ b/modules/default/newsfeed/newsfeed.js
@@ -80,6 +80,9 @@ Module.register("newsfeed", {
 			this.generateFeed(payload);
 
 			if (!this.loaded) {
+				if (this.config.hideLoading) {
+					this.show();
+				}
 				this.scheduleUpdateInterval();
 			}
 
@@ -144,17 +147,9 @@ Module.register("newsfeed", {
 				fullArticle.src = this.getActiveItemURL();
 				wrapper.appendChild(fullArticle);
 			}
-
-			if (this.config.hideLoading) {
-				this.show();
-			}
 		} else {
-			if (this.config.hideLoading) {
-				this.hide();
-			} else {
-				wrapper.innerHTML = this.translate("LOADING");
-				wrapper.className = "small dimmed";
-			}
+			wrapper.innerHTML = this.translate("LOADING");
+			wrapper.className = "small dimmed";
 		}
 
 		return wrapper;
@@ -340,7 +335,9 @@ Module.register("newsfeed", {
 
 	notificationReceived: function (notification, payload, sender) {
 		const before = this.activeItem;
-		if (notification === "ARTICLE_NEXT") {
+		if (notification === "MODULE_DOM_CREATED" && this.config.hideLoading) {
+			this.hide();
+		} else if (notification === "ARTICLE_NEXT") {
 			this.activeItem++;
 			if (this.activeItem >= this.newsItems.length) {
 				this.activeItem = 0;