oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge wrapper js modifications

Browse source
This commit is contained in:
shortcutme 2016-11-07 22:53:07 +01:00
parent 0774662689
commit 81744c584e
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/Ui/media/all.js
View file

@ -41,7 +41,9 @@
this.ws.onmessage = this.onMessage; this.ws.onmessage = this.onMessage;
this.ws.onopen = this.onOpenWebsocket; this.ws.onopen = this.onOpenWebsocket;
this.ws.onerror = this.onErrorWebsocket; this.ws.onerror = this.onErrorWebsocket;
return this.ws.onclose = this.onCloseWebsocket; this.ws.onclose = this.onCloseWebsocket;
this.connected = false;
return this.message_queue = [];
}; };
ZeroWebsocket.prototype.onMessage = function(e) { ZeroWebsocket.prototype.onMessage = function(e) {
@ -94,7 +96,12 @@
message.id = this.next_message_id; message.id = this.next_message_id;
this.next_message_id += 1; this.next_message_id += 1;
} }
this.ws.send(JSON.stringify(message)); if (this.connected) {
this.ws.send(JSON.stringify(message));
} else {
this.log("Not connected, adding message to queue");
this.message_queue.push(message);
}
if (cb) { if (cb) {
return this.waiting_cb[message.id] = cb; return this.waiting_cb[message.id] = cb;
} }
@ -107,7 +114,15 @@
}; };
ZeroWebsocket.prototype.onOpenWebsocket = function(e) { ZeroWebsocket.prototype.onOpenWebsocket = function(e) {
var message, _i, _len, _ref;
this.log("Open"); this.log("Open");
this.connected = true;
_ref = this.message_queue;
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
message = _ref[_i];
this.ws.send(JSON.stringify(message));
}
this.message_queue = [];
if (this.onOpen != null) { if (this.onOpen != null) {
return this.onOpen(e); return this.onOpen(e);
} }
@ -125,6 +140,7 @@
reconnect = 10000; reconnect = 10000;
} }
this.log("Closed", e); this.log("Closed", e);
this.connected = false;
if (e && e.code === 1000 && e.wasClean === false) { if (e && e.code === 1000 && e.wasClean === false) {
this.log("Server error, please reload the page", e.wasClean); this.log("Server error, please reload the page", e.wasClean);
} else { } else {
@ -149,6 +165,7 @@
}).call(this); }).call(this);
/* ---- src/Ui/media/lib/jquery.cssanim.js ---- */ /* ---- src/Ui/media/lib/jquery.cssanim.js ---- */
@ -521,7 +538,6 @@ jQuery.extend( jQuery.easing,
}).call(this); }).call(this);
/* ---- src/Ui/media/Loading.coffee ---- */ /* ---- src/Ui/media/Loading.coffee ---- */