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