add utf-8 to visualization html and replace CRLF with LF in XSLT for …

…transformation
slovensko-digital · Nov 20, 2023 · b30bee1 · b30bee1
1 parent 7319739
commit b30bee1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/src/main/java/digital/slovensko/autogram/core/eforms/EFormUtils.java b/src/main/java/digital/slovensko/autogram/core/eforms/EFormUtils.java
@@ -245,6 +245,7 @@ public static String transform(DSSDocument documentToDisplay, String transformat
                 xmlSource = new DOMSource(getEformXmlFromXdcDocument(documentToDisplay));
             }
 
+            transformation = transformation.replaceAll("\r\n", "\n");
             var transformer = XMLUtils.getSecureTransformerFactory().newTransformer(new StreamSource(
                 new ByteArrayInputStream(transformation.getBytes(ENCODING))));
 

diff --git a/src/main/resources/digital/slovensko/autogram/ui/gui/visualization-html.html b/src/main/resources/digital/slovensko/autogram/ui/gui/visualization-html.html
@@ -1,16 +1,18 @@
 <!-- Doesn't allow loading any external or inline scripts, allow inline styles & images -->
-<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src data:; style-src 'unsafe-inline';">
-<style>
-    body {
-        margin: 0;
-    }
-    iframe {
-        border: none;
-        width: 100%;
-        height: 100%;
-    }
-</style>
-
+<head>
+    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src data:; style-src 'unsafe-inline';">
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <style>
+        body {
+            margin: 0;
+        }
+        iframe {
+            border: none;
+            width: 100%;
+            height: 100%;
+        }
+    </style>
+</head>
 <body>
     <!-- Sandboxed frame without any support for navigation or prompts -->
     <iframe id="frame" sandbox></iframe>