Resolved merge conflict
This commit is contained in:
		| @@ -106,12 +106,7 @@ function performRequest(text, checkXML, checkTransform){ | |||||||
| async function restRequest(text) { | async function restRequest(text) { | ||||||
|     const escapeChar = "specialEscapeChar"; |     const escapeChar = "specialEscapeChar"; | ||||||
|     // const addr = "http://localhost:8081/" + text; |     // const addr = "http://localhost:8081/" + text; | ||||||
|     var port = ":8081/" |     const addr = window.location.protocol + "//" + window.location.hostname + ":8081/" + text; | ||||||
|     if (getProcessor() == "libxml") { |  | ||||||
|         port = ":8082/" |  | ||||||
|     } |  | ||||||
|     const addr = window.location.protocol + "//" + window.location.hostname + port + text; |  | ||||||
|     console.log(addr) |  | ||||||
|      |      | ||||||
|     var xmlData = document.getElementById("xmlArea").value.trim(); |     var xmlData = document.getElementById("xmlArea").value.trim(); | ||||||
|     var transformData = document.getElementById("transformArea").value.trim(); |     var transformData = document.getElementById("transformArea").value.trim(); | ||||||
| @@ -119,7 +114,7 @@ async function restRequest(text) { | |||||||
|     if(defaultStrings.includes(xmlData)){ |     if(defaultStrings.includes(xmlData)){ | ||||||
|         xmlData = "<empty/>"; |         xmlData = "<empty/>"; | ||||||
|     } |     } | ||||||
|     console.log(getProcessor()); |  | ||||||
|     // var data = xmlData.concat(escapeChar, transformData); |     // var data = xmlData.concat(escapeChar, transformData); | ||||||
|  |  | ||||||
|     // const url = addr.concat("?escapechar=", escapeChar, "&processor=", getProcInfo()); |     // const url = addr.concat("?escapechar=", escapeChar, "&processor=", getProcInfo()); | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user