@@ -14,21 +14,35 @@ Elm.HTTP = function() {
1414 function post(url) { return function(data) {
1515 return request("POST")(url)(data)(["Nil"]); }; }
1616
17− function sendReq(responses) { return function(req) {
18− Dispatcher.notify(responses.id,["Waiting"]);
17+ function registerReq(queue,responses) { return function(req) {
18+ if (req.url !== "") { sendReq(queue,responses,req); }
19+ };
20+ }
21+
22+ function updateQueue(queue,responses) {
23+ if (queue.length > 0) {
24+ Dispatcher.notify(responses.id, queue[0].value);
25+ if (queue[0].value[0] !== "Waiting") {
26+ queue.shift();
27+ setTimeout(function() { updateQueue(queue,responses); }, 0);
28+ }
29+ }
30+ }
31+
32+ function sendReq(queue,responses,req) {
33+ var response = { value: ["Waiting"] };
34+ queue.push(response);
35+
1936 var request = null;
20− if (window.XMLHttpRequest) {
21− request = new XMLHttpRequest();
22− } else if (window.ActiveXObject) {
23− request = new ActiveXObject("Microsoft.XMLHTTP");
24− }
37+ if (window.ActiveXObject) { request = new ActiveXObject("Microsoft.XMLHTTP"); }
38+ if (window.XMLHttpRequest) { request = new XMLHttpRequest(); }
2539 request.onreadystatechange = function(e) {
2640 if (request.readyState === 4) {
27− Dispatcher.notify(
28− responses.id,
29− request.status === 200
30− ? ["Success", toElmString(request.responseText)]
31− : ["Failure", request.status, toElmString(request.statusText)]);
41+ response.value = (request.status === 200
42+ ? ["Success", toElmString(request.responseText)]
43+ : ["Failure", request.status,
44+ toElmString(request.statusText)]);
45+ setTimeout(function() { updateQueue(queue,responses); }, 0);
3246 }
3347 };
3448 request.open(req.verb, req.url, true);
@@ -39,12 +53,11 @@ Elm.HTTP = function() {
3953 })(req.headers);
4054 request.send(req.data);
4155 return null;
42− };
4356 }
4457
4558 function send(requests) {
4659 var responses = Elm.Signal.constant(["Waiting"]);
47− var sender = Elm.Signal.lift(sendReq(responses))(requests);
60+ var sender = Elm.Signal.lift(registerReq([],responses))(requests);
4861 function f(x) { return function(y) { return x; } }
4962 var combine = Elm.Signal.lift2(f)(responses)(sender);
5063 return combine;