Changeset 35796 for main/trunk/model-interfaces-dev

Timestamp:

2021-12-10T14:22:20+13:00 (2 years ago)

Author:

cstephen

Message:

Fix direct input formatting

File:

• main/trunk/model-interfaces-dev/atea/macron-restoration/src/components/DirectInput.vue (modified) (3 diffs)

main/trunk/model-interfaces-dev/atea/macron-restoration/src/components/DirectInput.vue

@@ -8 +8 @@
         <span v-if="errorState" class="error-text">{{ translations.get('DirectInput_UnknownError') }}</span>
 
-        <span class="preserveWhitespace" v-html="formattedRestored" />
+        <span class="preserveWhitespace" v-html="htmlFormattedRestored" />
     </div>
 
@@ -113 +113 @@
             }
         },
-        formattedRestored() {
+        htmlFormattedRestored() {
             let restored = "";
 
@@ -135 +135 @@
             }
 
-            return restored;
+            return restored.trim();
+        },
+        formattedRestored() {
+            let restored = "";
+
+            for (const word of this.restored) {
+                if (word.w) {
+                    if (word[0] !== "-") {
+                        restored += " ";
+                    }
+
+                    restored += word.w;
+                }
+
+                if (word.linebreaks) {
+                    restored += this.normaliseLinebreak(word.linebreaks);
+                }
+            }
+
+            return restored.trim();
         },
         ...mapState({