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

Merge bf18b69cf4 into b56d975248

This commit is contained in:
Ayon Ghosh 2017-02-27 15:32:53 +00:00 committed by GitHub
parent b56d975248 bf18b69cf4
commit 7915a3a953
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/rfb.js
View File

@ -169,7 +169,8 @@
'onFBUComplete': function () { }, // onFBUComplete(rfb, fbu): RFB FBU received and processed 'onFBUComplete': function () { }, // onFBUComplete(rfb, fbu): RFB FBU received and processed
'onFBResize': function () { }, // onFBResize(rfb, width, height): frame buffer resized 'onFBResize': function () { }, // onFBResize(rfb, width, height): frame buffer resized
'onDesktopName': function () { }, // onDesktopName(rfb, name): desktop name received 'onDesktopName': function () { }, // onDesktopName(rfb, name): desktop name received
'onXvpInit': function () { } // onXvpInit(version): XVP extensions active for this connection 'onXvpInit': function () { } // onXvpInit(version): XVP extensions active for this connection,
'onWsConnEvent': function () { }, // onWsConnEvent(eventType, event): a WebSocket connection event occurred
}); });
// main setup // main setup
@ -215,6 +216,7 @@
} else { } else {
this._fail("Unexpected server connection"); this._fail("Unexpected server connection");
} }
this._onWsConnEvent('open');
}.bind(this)); }.bind(this));
this._sock.on('close', function (e) { this._sock.on('close', function (e) {
Util.Warn("WebSocket on-close event"); Util.Warn("WebSocket on-close event");
@ -248,9 +250,11 @@
break; break;
} }
this._sock.off('close'); this._sock.off('close');
this._onWsConnEvent('close', e);
}.bind(this)); }.bind(this));
this._sock.on('error', function (e) { this._sock.on('error', function (e) {
Util.Warn("WebSocket on-error event"); Util.Warn("WebSocket on-error event");
this.onWsConnEvent('error', e);
}); });
this._init_vars(); this._init_vars();
@ -1475,7 +1479,8 @@
['onFBUComplete', 'rw', 'func'], // onFBUComplete(rfb, fbu): RFB FBU received and processed ['onFBUComplete', 'rw', 'func'], // onFBUComplete(rfb, fbu): RFB FBU received and processed
['onFBResize', 'rw', 'func'], // onFBResize(rfb, width, height): frame buffer resized ['onFBResize', 'rw', 'func'], // onFBResize(rfb, width, height): frame buffer resized
['onDesktopName', 'rw', 'func'], // onDesktopName(rfb, name): desktop name received ['onDesktopName', 'rw', 'func'], // onDesktopName(rfb, name): desktop name received
['onXvpInit', 'rw', 'func'] // onXvpInit(version): XVP extensions active for this connection ['onXvpInit', 'rw', 'func'], // onXvpInit(version): XVP extensions active for this connection
['onWsConnEvent', 'rw', 'func'], // onWsConnEvent(eventType, event): A WebSocket connection event occurred
]); ]);
RFB.prototype.set_local_cursor = function (cursor) { RFB.prototype.set_local_cursor = function (cursor) {