jandres/noVNC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Opera works! Fix message event drops/reorders.

Browse Source 
Instead of relying on FABridge AS -> JS event delivery, we just use
the events to notify JS of pending data. The message handler then
calls the AS readSocketData routine which sends back an array of
the pending WebSocket frames.

There is still a minor bug somewhere that happens after the first
connect where the web-socket-js throws an "INVALID_STATE_ERR: Web
Socket connection has not been established". But, Opera is now usable
and we should be able to drop the packet sequence numbering and
re-ordering code.

Another minor issue to better support Opera is to move JS script
includes to the <head> of the page instead of after the body.
This commit is contained in:
Joel Martin
2010-07-01 09:53:38 -05:00
parent 1eba7b4279
commit a93c955538
6 changed files with 48 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
include/web-socket-js/web_socket.js
View File

@@ -52,20 +52,24 @@
});
self.__flash.addEventListener("message", function(fe) {
var data = decodeURIComponent(fe.getData());
try {
if (self.onmessage) {
var e;
if (window.MessageEvent) {
e = document.createEvent("MessageEvent");
e.initMessageEvent("message", false, false, data, null, null, window, null);
} else { // IE
e = {data: data};
var i, arr, data;
arr = self.__flash.readSocketData();
for (i=0; i < arr.length; i++) {
data = decodeURIComponent(arr[i]);
try {
if (self.onmessage) {
var e;
if (window.MessageEvent) {
e = document.createEvent("MessageEvent");
e.initMessageEvent("message", false, false, data, null, null, window, null);
} else { // IE
e = {data: data};
}
self.onmessage(e);
}
self.onmessage(e);
} catch (e) {
console.error(e.toString());
}
} catch (e) {
console.error(e.toString());
}
});