[newsfeed] getTemplateData: check activeItem index earlier

MagicMirrorOrg · Jan 13, 2024 · 4430012 · 4430012
1 parent 95c0b1b
commit 4430012
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/modules/default/newsfeed/newsfeed.js b/modules/default/newsfeed/newsfeed.js
@@ -118,6 +118,9 @@ Module.register("newsfeed", {
 
 	//Override template data and return whats used for the current template
 	getTemplateData () {
+		if (this.activeItem >= this.newsItems.length) {
+			this.activeItem = 0;
+		}
 		// this.config.showFullArticle is a run-time configuration, triggered by optional notifications
 		if (this.config.showFullArticle) {
 			return {
@@ -134,9 +137,6 @@ Module.register("newsfeed", {
 				empty: true
 			};
 		}
-		if (this.activeItem >= this.newsItems.length) {
-			this.activeItem = 0;
-		}
 
 		const item = this.newsItems[this.activeItem];
 		const items = this.newsItems.map(function (item) {