Bläddra i källkod

Updates app.bundle.js

j8
paweldomas 9 år sedan
förälder
incheckning
ff199a4d78
2 ändrade filer med 17 tillägg och 20 borttagningar
  1. 1
    1
      index.html
  2. 16
    19
      libs/app.bundle.js

+ 1
- 1
index.html Visa fil

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

+ 16
- 19
libs/app.bundle.js Visa fil

@@ -11510,14 +11510,21 @@ var HttpConfig = {
11510 11510
         console.info(
11511 11511
             "Send config request to " + endpoint + " for room: " + roomName);
11512 11512
 
11513
-        var request = new XMLHttpRequest();
11514
-        var error = null;
11515
-        request.onreadystatechange = function (aEvt) {
11516
-            if (request.readyState == 4) {
11517
-                var status = request.status;
11518
-                if (status === 200) {
11513
+
11514
+        $.ajax(
11515
+            endpoint,
11516
+            {
11517
+                method: 'POST',
11518
+                contentType: 'application/json',
11519
+                data: JSON.stringify({"roomName": roomName}),
11520
+                dataType: 'json',
11521
+                error: function(jqXHR, textStatus, errorThrown) {
11522
+                    console.error("Get config error: ", jqXHR, errorThrown)
11523
+                    error = "Get config response status: " + textStatus;
11524
+                    complete(false, error);
11525
+                },
11526
+                success: function(data, textStatus, jqXHR) {
11519 11527
                     try {
11520
-                        var data = JSON.parse(request.responseText);
11521 11528
                         configUtil.overrideConfigJSON(
11522 11529
                             config, interfaceConfig, data);
11523 11530
                         complete(true);
@@ -11525,21 +11532,11 @@ var HttpConfig = {
11525 11532
                     } catch (exception) {
11526 11533
                         console.error("Parse config error: ", exception);
11527 11534
                         error = exception;
11535
+                        complete(false, error);
11528 11536
                     }
11529
-                } else {
11530
-                    console.error("Get config error: ", request, status);
11531
-                    error = "Get config response status: " + status;
11532 11537
                 }
11533
-                complete(false, error);
11534 11538
             }
11535
-        };
11536
-
11537
-        request.open("POST", endpoint, true);
11538
-
11539
-        request.setRequestHeader(
11540
-            "Content-Type", "application/json;charset=UTF-8");
11541
-
11542
-        request.send({ "roomName": roomName });
11539
+        );
11543 11540
     }
11544 11541
 };
11545 11542
 

Laddar…
Avbryt
Spara