From 28e76b23744a73e23f4a76387c8c3d14e77b0630 Mon Sep 17 00:00:00 2001 From: Adam Bem Date: Tue, 28 Feb 2023 14:18:54 +0100 Subject: [PATCH] Fixed bugs mentioned in comments for #35 Co-authored-by: Adam Bem Reviewed-on: https://gitea.release11.com/R11/release11-tools-web/pulls/85 --- Frontend/assets/scripts/tools/scripts.js | 27 ++++++++++++++++-------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/Frontend/assets/scripts/tools/scripts.js b/Frontend/assets/scripts/tools/scripts.js index d464330..9f10a53 100644 --- a/Frontend/assets/scripts/tools/scripts.js +++ b/Frontend/assets/scripts/tools/scripts.js @@ -13,7 +13,12 @@ function clearDefaultContent(element, text) { function clearDataField(){ document.getElementById("xmlArea").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; } function fillDefaultXML(element) { @@ -29,7 +34,7 @@ function fillDefaultXML(element) { } //Set default text in grey -function setDefaultContent(element, text) { +function setDefaultContent(element, text) {6543 if (element.value == "") { var id = element.getAttribute('id'); if (!defaultStrings.includes(text)) { @@ -99,12 +104,14 @@ function refreshTooltip() { function performRequest(endpoint, checkXML, checkTransform){ + const sourceId = "xmlArea"; + const transformId = "transformArea"; var xmlData = document.getElementById(sourceId).value.trim(); - var transformData = document.getElementById(targetId).value.trim(); + var transformData = document.getElementById(transformId).value.trim(); - var port = 8081 + var port = 8081; if (getProcessor() == "libxml") { - port = 8082 + port = 8082; } var empty = false; @@ -114,11 +121,14 @@ function performRequest(endpoint, checkXML, checkTransform){ empty = true; } if (defaultStrings.includes(transformData) && checkTransform) { - document.getElementById(targetId).style.backgroundColor = color_red; + document.getElementById(transformId).style.backgroundColor = color_red; empty = true; } if (!empty) { restRequest(port, endpoint, xmlData, transformData).then(function(result) { + console.log(xmlData); + console.log(transformData); + document.getElementById("resultArea").value = result.result; document.getElementById("procinfo").innerText = ' Computed using '.concat(" ", result.processor); if (result.status = "OK") { @@ -148,12 +158,11 @@ function performFormatRequest(endpoint, checkXML, sourceId, targetId){ if (!empty) { restRequest(port, endpoint, xmlData, "").then(function(result) { - document.getElementById(targetId).value = result.result; + if (result.status == "OK") { + document.getElementById(targetId).value = result.result; + } }); - }else{ - document.getElementById(targetId).value = "No data provided!"; - return false; } }