Updates app.bundle.js

This commit is contained in:
paweldomas 2015-08-28 17:07:02 +02:00
parent aebfa33383
commit ff199a4d78
2 changed files with 17 additions and 20 deletions

View File

@ -20,7 +20,7 @@
<script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib --> <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
<script src="libs/toastr.js?v=1"></script><!-- notifications lib --> <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
<script src="interface_config.js?v=5"></script> <script src="interface_config.js?v=5"></script>
<script src="libs/app.bundle.js?v=132"></script> <script src="libs/app.bundle.js?v=133"></script>
<script src="analytics.js?v=1"></script><!-- google analytics plugin --> <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
<link rel="stylesheet" href="css/font.css?v=7"/> <link rel="stylesheet" href="css/font.css?v=7"/>
<link rel="stylesheet" href="css/toastr.css?v=1"> <link rel="stylesheet" href="css/toastr.css?v=1">

View File

@ -11510,14 +11510,21 @@ var HttpConfig = {
console.info( console.info(
"Send config request to " + endpoint + " for room: " + roomName); "Send config request to " + endpoint + " for room: " + roomName);
var request = new XMLHttpRequest();
var error = null; $.ajax(
request.onreadystatechange = function (aEvt) { endpoint,
if (request.readyState == 4) { {
var status = request.status; method: 'POST',
if (status === 200) { 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 { try {
var data = JSON.parse(request.responseText);
configUtil.overrideConfigJSON( configUtil.overrideConfigJSON(
config, interfaceConfig, data); config, interfaceConfig, data);
complete(true); complete(true);
@ -11525,21 +11532,11 @@ var HttpConfig = {
} catch (exception) { } catch (exception) {
console.error("Parse config error: ", exception); console.error("Parse config error: ", exception);
error = exception; error = exception;
}
} else {
console.error("Get config error: ", request, status);
error = "Get config response status: " + status;
}
complete(false, error); complete(false, error);
} }
}; }
}
request.open("POST", endpoint, true); );
request.setRequestHeader(
"Content-Type", "application/json;charset=UTF-8");
request.send({ "roomName": roomName });
} }
}; };