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

Swap out onclose for addEventListener('close') on WebChannel

This commit is contained in:
Ryan Castner 2020-04-09 08:49:57 -04:00
parent ae6db4316b
commit fc8518c057
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/rfb.js
View File

@ -57,7 +57,7 @@ const rawChannelProps = [
"send", "send",
"close", "close",
"binaryType", "binaryType",
"onclose", "addEventListener",
"onerror", "onerror",
"onmessage", "onmessage",
"onopen", "onopen",

12
core/websock.js
View File

@ -217,17 +217,19 @@ export default class WebChannel {
Log.Debug(`<< WebChannel.onopen`); Log.Debug(`<< WebChannel.onopen`);
}; };
const onClose = (e) => {
Log.Debug(`>> WebChannel.close event`);
this._eventHandlers.close(e);
Log.Debug(`<< WebChannel.close event`);
};
if (!isOpen) { if (!isOpen) {
this._rawChannel.onopen = onOpen; this._rawChannel.onopen = onOpen;
} else { } else {
onOpen(); onOpen();
} }
this._rawChannel.onclose = (e) => { this._rawChannel.addEventListener('close', onClose.bind(this));
Log.Debug(`>> WebChannel.onclose`);
this._eventHandlers.close(e);
Log.Debug(`<< WebChannel.onclose`);
};
this._rawChannel.onerror = (e) => { this._rawChannel.onerror = (e) => {
Log.Debug(`>> WebChannel.onerror: ` + e); Log.Debug(`>> WebChannel.onerror: ` + e);