R11/release11-tools
4
2
Fork 0
Code Issues 9 Pull Requests 4 Packages Projects Releases 6 Wiki Activity

Resolved merge conflict

Browse Source
This commit is contained in:
Adam Bem
2023-02-28 14:57:20 +01:00
parent 50a8082f32
commit ff7e7461e9
1 changed files with 0 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Frontend/assets/scripts/tools/scripts.js
View File

@@ -13,16 +13,12 @@ function clearDefaultContent(element, text) {
function clearDataField(){ function clearDataField(){
document.getElementById("xmlArea").value = ""; document.getElementById("xmlArea").value = "";
<<<<<<< HEAD
document.getElementById("transformArea").value = "";
=======
document.getElementById("xmlArea").style.color = null; document.getElementById("xmlArea").style.color = null;
document.getElementById("xmlArea").style.backgroundColor = null; document.getElementById("xmlArea").style.backgroundColor = null;
document.getElementById("transformArea").value = ""; document.getElementById("transformArea").value = "";
document.getElementById("transformArea").style.color = null; document.getElementById("transformArea").style.color = null;
document.getElementById("transformArea").style.backgroundColor = null; document.getElementById("transformArea").style.backgroundColor = null;
>>>>>>> dev
} }
function fillDefaultXML(element) { function fillDefaultXML(element) {
@@ -112,14 +108,6 @@ function refreshTooltip() {
function performRequest(endpoint, checkXML, checkTransform){ 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 sourceId = "xmlArea";
const transformId = "transformArea"; const transformId = "transformArea";
var xmlData = document.getElementById(sourceId).value.trim(); var xmlData = document.getElementById(sourceId).value.trim();
@@ -128,7 +116,6 @@ function performRequest(endpoint, checkXML, checkTransform){
var port = 8081; var port = 8081;
if (getProcessor() == "libxml") { if (getProcessor() == "libxml") {
port = 8082; port = 8082;
>>>>>>> dev
} }
var empty = false; var empty = false;
@@ -138,21 +125,11 @@ function performRequest(endpoint, checkXML, checkTransform){
empty = true; empty = true;
} }
if (defaultStrings.includes(transformData) && checkTransform) { if (defaultStrings.includes(transformData) && checkTransform) {
<<<<<<< HEAD
document.getElementById(targetId).style.backgroundColor = color_red;
=======
document.getElementById(transformId).style.backgroundColor = color_red; document.getElementById(transformId).style.backgroundColor = color_red;
>>>>>>> dev
empty = true; empty = true;
} }
if (!empty) { if (!empty) {
restRequest(port, endpoint, xmlData, transformData).then(function(result) { restRequest(port, endpoint, xmlData, transformData).then(function(result) {
<<<<<<< HEAD
=======
console.log(xmlData);
console.log(transformData);
>>>>>>> dev
document.getElementById("resultArea").value = result.result; document.getElementById("resultArea").value = result.result;
document.getElementById("procinfo").innerText = ' Computed using '.concat(" ", result.processor); document.getElementById("procinfo").innerText = ' Computed using '.concat(" ", result.processor);
if (result.status = "OK") { if (result.status = "OK") {
@@ -182,20 +159,11 @@ function performFormatRequest(endpoint, checkXML, sourceId, targetId){
if (!empty) { if (!empty) {
restRequest(port, endpoint, xmlData, "").then(function(result) { 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") { if (result.status == "OK") {
document.getElementById(targetId).value = result.result; document.getElementById(targetId).value = result.result;
} }
}); });
>>>>>>> dev
} }
} }