From aa21e137801e88ee7e9d3bd03ba8520c79e8bcd6 Mon Sep 17 00:00:00 2001 From: mksh Date: Thu, 27 Aug 2015 11:56:19 +0300 Subject: [PATCH] Fixed configuration callback request data serialization; switched to jQuery for ajax call --- modules/config/HttpConfigFetch.js | 35 ++++++++++++++----------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/modules/config/HttpConfigFetch.js b/modules/config/HttpConfigFetch.js index 270b59be0..b66ba8a52 100644 --- a/modules/config/HttpConfigFetch.js +++ b/modules/config/HttpConfigFetch.js @@ -19,14 +19,21 @@ var HttpConfig = { console.info( "Send config request to " + endpoint + " for room: " + roomName); - var request = new XMLHttpRequest(); - var error = null; - request.onreadystatechange = function (aEvt) { - if (request.readyState == 4) { - var status = request.status; - if (status === 200) { + + $.ajax( + endpoint, + { + method: 'POST', + contentType: 'application/json', + data: JSON.stringify({"roomName": roomName}), + dataType: 'json', + error: function(jqXHR, textStatus, errorThrown) { + console.error("Get config error: ", jqXHR, errorThrown) + error = "Get config response status: " + textStatus; + complete(false, error); + }, + success: function(data, textStatus, jqXHR) { try { - var data = JSON.parse(request.responseText); configUtil.overrideConfigJSON( config, interfaceConfig, data); complete(true); @@ -34,21 +41,11 @@ var HttpConfig = { } catch (exception) { console.error("Parse config error: ", exception); error = exception; + complete(false, error); } - } else { - console.error("Get config error: ", request, status); - error = "Get config response status: " + status; } - complete(false, error); } - }; - - request.open("POST", endpoint, true); - - request.setRequestHeader( - "Content-Type", "application/json;charset=UTF-8"); - - request.send({ "roomName": roomName }); + ); } };