From ff7e7461e918a6514c3a111e5cd77ec3957e0e7c Mon Sep 17 00:00:00 2001
From: Adam Bem <adam.bem@zoho.eu>
Date: Tue, 28 Feb 2023 14:57:20 +0100
Subject: [PATCH] Resolved merge conflict

---
 Frontend/assets/scripts/tools/scripts.js | 32 ------------------------
 1 file changed, 32 deletions(-)

diff --git a/Frontend/assets/scripts/tools/scripts.js b/Frontend/assets/scripts/tools/scripts.js
index c2671ba..66e0d7f 100644
--- a/Frontend/assets/scripts/tools/scripts.js
+++ b/Frontend/assets/scripts/tools/scripts.js
@@ -13,16 +13,12 @@ function clearDefaultContent(element, text) {
 
 function clearDataField(){
     document.getElementById("xmlArea").value = "";
-<<<<<<< HEAD
-    document.getElementById("transformArea").value = "";
-=======
     document.getElementById("xmlArea").style.color = null;
     document.getElementById("xmlArea").style.backgroundColor = null;
     
     document.getElementById("transformArea").value = "";
     document.getElementById("transformArea").style.color = null;
     document.getElementById("transformArea").style.backgroundColor = null;
->>>>>>> dev
 }
 
 function fillDefaultXML(element) {
@@ -112,14 +108,6 @@ function refreshTooltip() {
 
 
 function performRequest(endpoint, checkXML, checkTransform){
-<<<<<<< HEAD
-    var xmlData = document.getElementById(sourceId).value.trim();
-    var transformData = document.getElementById(targetId).value.trim();
-    
-    var port = 8081
-    if (getProcessor() == "libxml") {
-        port = 8082
-=======
     const sourceId = "xmlArea";
     const transformId = "transformArea";
     var xmlData = document.getElementById(sourceId).value.trim();
@@ -128,7 +116,6 @@ function performRequest(endpoint, checkXML, checkTransform){
     var port = 8081;
     if (getProcessor() == "libxml") {
         port = 8082;
->>>>>>> dev
     }
 
     var empty = false;
@@ -138,21 +125,11 @@ function performRequest(endpoint, checkXML, checkTransform){
             empty = true;
     }
     if (defaultStrings.includes(transformData) && checkTransform) {
-<<<<<<< HEAD
-        document.getElementById(targetId).style.backgroundColor = color_red;
-=======
         document.getElementById(transformId).style.backgroundColor = color_red;
->>>>>>> dev
         empty = true;
     }
     if (!empty) {
         restRequest(port, endpoint, xmlData, transformData).then(function(result) {
-<<<<<<< HEAD
-=======
-            console.log(xmlData);
-            console.log(transformData);
-
->>>>>>> dev
             document.getElementById("resultArea").value = result.result;
             document.getElementById("procinfo").innerText = ' Computed using '.concat(" ", result.processor);
             if (result.status = "OK") {
@@ -182,20 +159,11 @@ function performFormatRequest(endpoint, checkXML, sourceId, targetId){
 
     if (!empty) {
         restRequest(port, endpoint, xmlData, "").then(function(result) {
-<<<<<<< HEAD
-            document.getElementById(targetId).value = result.result;
-            
-        });
-    }else{
-        document.getElementById(targetId).value = "No data provided!";
-        return false;
-=======
             if (result.status == "OK") {
                 document.getElementById(targetId).value = result.result;
             }
             
         });
->>>>>>> dev
     }
     
 }