Преглед на файлове

Fixed configuration callback request data serialization; switched to jQuery for ajax call

master
mksh преди 9 години
родител
ревизия
aa21e13780
променени са 1 файла, в които са добавени 16 реда и са изтрити 19 реда
  1. 16
    19
      modules/config/HttpConfigFetch.js

+ 16
- 19
modules/config/HttpConfigFetch.js Целия файл

19
         console.info(
19
         console.info(
20
             "Send config request to " + endpoint + " for room: " + roomName);
20
             "Send config request to " + endpoint + " for room: " + roomName);
21
 
21
 
22
-        var request = new XMLHttpRequest();
23
-        var error = null;
24
-        request.onreadystatechange = function (aEvt) {
25
-            if (request.readyState == 4) {
26
-                var status = request.status;
27
-                if (status === 200) {
22
+
23
+        $.ajax(
24
+            endpoint,
25
+            {
26
+                method: 'POST',
27
+                contentType: 'application/json',
28
+                data: JSON.stringify({"roomName": roomName}),
29
+                dataType: 'json',
30
+                error: function(jqXHR, textStatus, errorThrown) {
31
+                    console.error("Get config error: ", jqXHR, errorThrown)
32
+                    error = "Get config response status: " + textStatus;
33
+                    complete(false, error);
34
+                },
35
+                success: function(data, textStatus, jqXHR) {
28
                     try {
36
                     try {
29
-                        var data = JSON.parse(request.responseText);
30
                         configUtil.overrideConfigJSON(
37
                         configUtil.overrideConfigJSON(
31
                             config, interfaceConfig, data);
38
                             config, interfaceConfig, data);
32
                         complete(true);
39
                         complete(true);
34
                     } catch (exception) {
41
                     } catch (exception) {
35
                         console.error("Parse config error: ", exception);
42
                         console.error("Parse config error: ", exception);
36
                         error = exception;
43
                         error = exception;
44
+                        complete(false, error);
37
                     }
45
                     }
38
-                } else {
39
-                    console.error("Get config error: ", request, status);
40
-                    error = "Get config response status: " + status;
41
                 }
46
                 }
42
-                complete(false, error);
43
             }
47
             }
44
-        };
45
-
46
-        request.open("POST", endpoint, true);
47
-
48
-        request.setRequestHeader(
49
-            "Content-Type", "application/json;charset=UTF-8");
50
-
51
-        request.send({ "roomName": roomName });
48
+        );
52
     }
49
     }
53
 };
50
 };
54
 
51
 

Loading…
Отказ
Запис