From b1c26e6f6413dd408b25feb1310e5aafb3f77570 Mon Sep 17 00:00:00 2001
From: tod31 <tod31@users.noreply.github.com>
Date: Thu, 8 Apr 2021 10:54:28 +0200
Subject: [PATCH] remove empty lines

---
 client/components/cards/cardCustomFields.js | 12 ++++++------
 client/components/cards/minicard.js         | 17 ++++++++---------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/client/components/cards/cardCustomFields.js b/client/components/cards/cardCustomFields.js
index effcc3e91..016c22983 100644
--- a/client/components/cards/cardCustomFields.js
+++ b/client/components/cards/cardCustomFields.js
@@ -244,12 +244,12 @@ CardCustomField.register('cardCustomField');
   }
 
   formattedValue() {
-    lines = this.data().value.replace(/\r\n|\n\r|\n|\r/g, '\n').split('\n');
-    lines = lines.map(line =>
-      this.stringtemplateFormat.replace(/%\{value\}/gi, line)
-    );
-
-    return lines.join(' ');
+    return this.data().value
+      .replace(/\r\n|\n\r|\n|\r/g, '\n')
+      .split('\n')
+      .filter(value => value.trim() != '')
+      .map(value => this.stringtemplateFormat.replace(/%\{value\}/gi, value))
+      .join(' ');
   }
 
   events() {
diff --git a/client/components/cards/minicard.js b/client/components/cards/minicard.js
index 60996684f..ca3e241c8 100644
--- a/client/components/cards/minicard.js
+++ b/client/components/cards/minicard.js
@@ -26,16 +26,15 @@ BlazeComponent.extendComponent({
       .customFieldsWD()
       .find(f => f._id === definition._id);
 
-    if(customField && customField.trueValue) {
-      lines = customField.trueValue.replace(/\r\n|\n\r|\n|\r/g, '\n').split('\n');
-      lines = lines.map(line =>
-        definition.settings.stringtemplateFormat.replace(/%\{value\}/gi, line)
-      );
+    const customFieldTrueValue =
+      customField && customField.trueValue ? customField.trueValue : '';
 
-      return lines.join(' ');
-    } else {
-      return '';
-    }
+    return customFieldTrueValue
+      .replace(/\r\n|\n\r|\n|\r/g, '\n')
+      .split('\n')
+      .filter(value => value.trim() != '')
+      .map(value => definition.settings.stringtemplateFormat.replace(/%\{value\}/gi, value))
+      .join(' ');
   },
 
   events() {