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

fixes an error that was made in the merge with the last sync with websockify.

This commit is contained in:
samhed 2014-08-19 13:49:55 +02:00
parent 9b731d3a58
commit 960752ea53
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/websock.js
View File

@ -262,7 +262,7 @@ function on(evt, handler) {
eventHandlers[evt] = handler; eventHandlers[evt] = handler;
} }
function init(protocols) { function init(protocols, ws_schema) {
rQ = []; rQ = [];
rQi = 0; rQi = 0;
sQ = []; sQ = [];
@ -277,12 +277,13 @@ function init(protocols) {
('set' in Uint8Array.prototype)) { ('set' in Uint8Array.prototype)) {
bt = true; bt = true;
} }
// Check for full binary type support in WebSocket
// Check for full binary type support in WebSockets // Inspired by:
// TODO: this sucks, the property should exist on the prototype // https://github.com/Modernizr/Modernizr/issues/370
// but it does not. // https://github.com/Modernizr/Modernizr/blob/master/feature-detects/websockets/binary.js
try { try {
if (bt && ('binaryType' in (new WebSocket("ws://localhost:17523")))) { if (bt && ('binaryType' in WebSocket.prototype ||
!!(new WebSocket(ws_schema + '://.').binaryType))) {
Util.Info("Detected binaryType support in WebSockets"); Util.Info("Detected binaryType support in WebSockets");
wsbt = true; wsbt = true;
} }
@ -325,7 +326,8 @@ function init(protocols) {
} }
function open(uri, protocols) { function open(uri, protocols) {
protocols = init(protocols); var ws_schema = uri.match(/^([a-z]+):\/\//)[1];
protocols = init(protocols, ws_schema);
if (test_mode) { if (test_mode) {
websocket = {}; websocket = {};