From d09be2a59a66b97db1b2ac2fc4acd01274b8206b Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Mon, 20 Nov 2017 22:27:58 -0500
Subject: [PATCH] Update byjax.dm

---
 code/_js/byjax.dm | 54 -----------------------------------------------
 1 file changed, 54 deletions(-)

diff --git a/code/_js/byjax.dm b/code/_js/byjax.dm
index be418d465c..5557440d32 100644
--- a/code/_js/byjax.dm
+++ b/code/_js/byjax.dm
@@ -1,55 +1,3 @@
-<<<<<<< HEAD
-//this function places received data into element with specified id.
-#define js_byjax {"
-
-function replaceContent() {
-	var args = Array.prototype.slice.call(arguments);
-	var id = args\[0\];
-	var content = args\[1\];
-	var callback  = null;
-	if(args\[2\]){
-		callback = args\[2\];
-		if(args\[3\]){
-			args = args.slice(3);
-		}
-	}
-	var parent = document.getElementById(id);
-	if(typeof(parent)!=='undefined' && parent!=null){
-		parent.innerHTML = content?content:'';
-	}
-	if(callback && window\[callback\]){
-		window\[callback\].apply(null,args);
-	}
-}
-"}
-
-/*
-sends data to control_id:replaceContent
-
-receiver - mob
-control_id - window id (for windows opened with browse(), it'll be "windowname.browser")
-target_element - HTML element id
-new_content - HTML content
-callback - js function that will be called after the data is sent
-callback_args - arguments for callback function
-
-Be sure to include required js functions in your page, or it'll raise an exception.
-*/
-/proc/send_byjax(receiver, control_id, target_element, new_content=null, callback=null, list/callback_args=null)
-	if(receiver && target_element && control_id) // && winexists(receiver, control_id))
-		var/list/argums = list(target_element, new_content)
-		if(callback)
-			argums += callback
-			if(callback_args)
-				argums += callback_args
-		argums = list2params(argums)
-/*		if(callback_args)
-			argums += "&[list2params(callback_args)]"
-*/
-		receiver << output(argums,"[control_id]:replaceContent")
-	return
-
-=======
 //this function places received data into element with specified id.
 #define js_byjax {"
 
@@ -97,5 +45,3 @@ Be sure to include required js functions in your page, or it'll raise an excepti
 
 		receiver << output(argums,"[control_id]:replaceContent")
 	return
-
->>>>>>> b7a9a2a... Merge pull request #32844 from ShizCalev/code-cleanup