xhr helpers: wrap in promises

1 files changed, 24 insertions, 12 deletions

diff --git a/js/common.js b/js/common.js
index 788c159fe..210a1c6cc 100755
--- a/js/common.js
+++ b/js/common.js
@@ -18,23 +18,35 @@ function exception_error(e, e_compat, filename, lineno, colno) {
 
 function xhrPost(url, params, complete) {
 	console.log("xhrPost:", params);
-	return new Ajax.Request(url, {
-		parameters: params,
-		onComplete: complete
+
+	return new Promise((resolve, reject) => {
+		new Ajax.Request(url, {
+			parameters: params,
+			onComplete: function(reply) {
+				if (complete != undefined) complete(reply);
+
+				resolve(reply);
+			}
+		});
 	});
 }
 
 function xhrJson(url, params, complete) {
-	return xhrPost(url, params, (reply) => {
-		try {
-			const obj = JSON.parse(reply.responseText);
-			complete(obj);
-		} catch (e) {
-			console.error("xhrJson", e, reply);
-			complete(null);
-		}
+	return new Promise((resolve, reject) => {
+		return xhrPost(url, params).then((reply) => {
+			let obj = null;
+
+			try {
+				obj = JSON.parse(reply.responseText);
+			} catch (e) {
+				console.error("xhrJson", e, reply);
+			}
+
+			if (complete != undefined) complete(obj);
 
-	})
+			resolve(obj);
+		});
+	});
 }
 
 /* add method to remove element from array */