From 8797cac3247973b3a5fe9ae29f4e69ab264f03cd Mon Sep 17 00:00:00 2001 From: szewczyw Date: Tue, 21 Jan 2025 12:04:58 +0100 Subject: [PATCH] Clear code and fix minimize --- Backend-libXML/main.py | 2 +- .../formatter/XMLButtonFormatterComponent.vue | 37 +++++++++---------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/Backend-libXML/main.py b/Backend-libXML/main.py index 52999b4..50d6cec 100644 --- a/Backend-libXML/main.py +++ b/Backend-libXML/main.py @@ -39,7 +39,7 @@ def process_xml(request: request, type: str) -> str: # elif (type == "prettify"): # response_json['result'] = Parser.formatXML(data, True) elif (type == "minimize"): - response_json['result'] = Parser.formatXML(data, False) + response_json['result'] = Parser.formatXML(data) elif (type == "prettifyHtml"): response_json['result'] = Parser.formatHTML(data, True) elif (type == "minimizeHtml"): diff --git a/Frontend/src/components/formatter/XMLButtonFormatterComponent.vue b/Frontend/src/components/formatter/XMLButtonFormatterComponent.vue index e185763..aa237a1 100644 --- a/Frontend/src/components/formatter/XMLButtonFormatterComponent.vue +++ b/Frontend/src/components/formatter/XMLButtonFormatterComponent.vue @@ -18,38 +18,37 @@ function process() { } function prepareRequest():Request { - var request = new Request(prepareURL(), { - body: prepareRequestBody(), - method: "POST" + return new Request(prepareURL(), { + body: prepareRequestBody(), + method: "POST" }) - return request } function prepareURL(): string { - var mode = "/java/prettify" - if (props.isMinimizer) + let mode = "/java/prettify"; + console.log("prepareUrl") + console.log(props.isMinimizer) + if (props.isMinimizer) mode = "/libxml/minimize" return document.location.protocol + "//" + document.location.hostname + mode } function prepareRequestBody():string { - var requestBody = JSON.stringify({ - "data": props.xml, - "processorData": "N/A", - "processor": "libxml", - "version": "1.0" + return JSON.stringify({ + "data": props.xml, + "processorData": "N/A", + "processor": "libxml", + "version": "1.0" }) - return requestBody } async function fetchRequest(request: Request):Promise { - var responseBody = await fetch(request) - .then(response => response.json()) - .then((body) => { - emit("update:error", body.status == "ERR") - return body - }) - return responseBody + return await fetch(request) + .then(response => response.json()) + .then((body) => { + emit("update:error", body.status == "ERR") + return body + }) } function sendProcessedData(data: JSON) {