From 18d9e654d2722f1b8a67bab195de1cbb4c012dfc Mon Sep 17 00:00:00 2001
From: Adam Bem <adam.bem@zoho.eu>
Date: Mon, 15 May 2023 11:53:23 +0200
Subject: [PATCH] Merged json.js to jsonFormatter.js

---
 Frontend/assets/scripts/tools/json.js         | 72 ---------------
 .../assets/scripts/tools/jsonFormatter.js     | 91 ++++++++++++++++++-
 Frontend/tools/jsonFormatter.html             |  1 -
 3 files changed, 90 insertions(+), 74 deletions(-)
 delete mode 100644 Frontend/assets/scripts/tools/json.js

diff --git a/Frontend/assets/scripts/tools/json.js b/Frontend/assets/scripts/tools/json.js
deleted file mode 100644
index 1f5f09c..0000000
--- a/Frontend/assets/scripts/tools/json.js
+++ /dev/null
@@ -1,72 +0,0 @@
-function formatAndValidateJson(errorElement) {
-  const input = document.querySelector('#jsonBlock');
-  const processInfo = document.getElementById(errorElement);
-
-  const address = window.location.protocol + "//" + window.location.hostname + ":" + 8081 + "/json/formatting"
-
-  fetch(address, {
-    method: 'POST',
-    body: input.textContent
-  })
-  .then(async (response) => {
-    const promise = response.json();
-    if (!response.ok) {
-      throw Error(await promise);
-    }
-
-    return promise;
-  })
-  .then((data) => {
-    input.innerText = data.data;
-    processInfo.innerText = "";
-    hljs.highlightElement(input);
-
-    processInfo.innerHTML = "<b style='color: green'>Computed in </b> <span style='color: green'>" + data.time + "ms</span>";
-  })
-  .catch((error) => {
-    processInfo.innerHTML = "<b style='color: red'>" + error.data + "</b>";
-    console.error('Error:', error);
-  });
-}
-
-function minimizeJson(errorElement) {
-  const input = document.querySelector('#jsonBlock');
-  const processInfo = document.getElementById(errorElement);
-
-  const address = window.location.protocol + "//" + window.location.hostname + ":" + 8081 + "/json/minimize"
-
-  fetch(address, {
-    method: 'POST',
-    body: input.textContent
-  })
-  .then(async (response) => {
-    const promise = response.json();
-    if (!response.ok) {
-      throw Error(await promise);
-    }
-
-    return promise;
-  })
-  .then((data) => {
-    input.innerText = data.data;
-    processInfo.innerText = "";
-    hljs.highlightElement(input);
-
-    processInfo.innerHTML = "<b style='color: green'>Computed in </b> <span style='color: green'>" + data.time + "ms</span>";
-  })
-  .catch((error) => {
-    processInfo.innerHTML = "<b style='color: red'>" + error.data + "</b>";
-    console.error('Error:', error);
-  });
-}
-
-function clearJsonData() {
-  const input = document.querySelector('#jsonBlock');
-  input.textContent = "";
-}
-
-function insertDefaultJson() {
-  const input = document.querySelector('#jsonBlock');
-  input.textContent = "{\"enter\": \"your\", \"json\": \"here\"}";
-  hljs.highlightElement(input);
-}
\ No newline at end of file
diff --git a/Frontend/assets/scripts/tools/jsonFormatter.js b/Frontend/assets/scripts/tools/jsonFormatter.js
index 8be8832..54b7da5 100644
--- a/Frontend/assets/scripts/tools/jsonFormatter.js
+++ b/Frontend/assets/scripts/tools/jsonFormatter.js
@@ -1,8 +1,24 @@
+
+
 const mergeHTMLPlugin = (function () {
     'use strict';
 
     var originalStream;
 
+    /**
+     * @param {string} value
+     * @returns {string}
+     */
+    function escapeHTML(value) {
+        return value
+        .replace(/&/g, '&amp;')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')
+        .replace(/"/g, '&quot;')
+        .replace(/'/g, '&#x27;');
+    }
+      
+
     /* plugin itself */
 
     /** @type {HLJSPlugin} */
@@ -158,4 +174,77 @@ function init() {
     configurePastingInElement("jsonBlock");
 
     hljs.addPlugin(mergeHTMLPlugin);
-}
\ No newline at end of file
+}
+
+function formatAndValidateJson(errorElement) {
+    const input = document.querySelector('#jsonBlock');
+    const processInfo = document.getElementById(errorElement);
+  
+    const address = window.location.protocol + "//" + window.location.hostname + ":" + 8081 + "/json/formatting"
+  
+    fetch(address, {
+      method: 'POST',
+      body: input.textContent
+    })
+    .then(async (response) => {
+      const promise = response.json();
+      if (!response.ok) {
+        throw Error(await promise);
+      }
+  
+      return promise;
+    })
+    .then((data) => {
+      input.innerText = data.data;
+      processInfo.innerText = "";
+      hljs.highlightElement(input);
+  
+      processInfo.innerHTML = "<b style='color: green'>Computed in </b> <span style='color: green'>" + data.time + "ms</span>";
+    })
+    .catch((error) => {
+      processInfo.innerHTML = "<b style='color: red'>" + error.data + "</b>";
+      console.error('Error:', error);
+    });
+  }
+  
+  function minimizeJson(errorElement) {
+    const input = document.querySelector('#jsonBlock');
+    const processInfo = document.getElementById(errorElement);
+  
+    const address = window.location.protocol + "//" + window.location.hostname + ":" + 8081 + "/json/minimize"
+  
+    fetch(address, {
+      method: 'POST',
+      body: input.textContent
+    })
+    .then(async (response) => {
+      const promise = response.json();
+      if (!response.ok) {
+        throw Error(await promise);
+      }
+  
+      return promise;
+    })
+    .then((data) => {
+      input.innerText = data.data;
+      processInfo.innerText = "";
+      hljs.highlightElement(input);
+  
+      processInfo.innerHTML = "<b style='color: green'>Computed in </b> <span style='color: green'>" + data.time + "ms</span>";
+    })
+    .catch((error) => {
+      processInfo.innerHTML = "<b style='color: red'>" + error.data + "</b>";
+      console.error('Error:', error);
+    });
+  }
+  
+  function clearJsonData() {
+    const input = document.querySelector('#jsonBlock');
+    input.textContent = "";
+  }
+  
+  function insertDefaultJson() {
+    const input = document.querySelector('#jsonBlock');
+    input.textContent = "{\"enter\": \"your\", \"json\": \"here\"}";
+    hljs.highlightElement(input);
+  }
\ No newline at end of file
diff --git a/Frontend/tools/jsonFormatter.html b/Frontend/tools/jsonFormatter.html
index 348715b..8081f02 100644
--- a/Frontend/tools/jsonFormatter.html
+++ b/Frontend/tools/jsonFormatter.html
@@ -10,7 +10,6 @@
     <script src="../assets/scripts/common/hljs.min.js"></script>
     <script src="../assets/scripts/tools/jsonFormatter.js"></script>
     <script src="../assets/scripts/tools/highlight.js"></script>
-    <script src="../assets/scripts/tools/json.js"></script>
     <script>hljs.highlightAll();</script>
   </head>