diff options
| author | Pierre Ossman <ossman@cendio.se> | 2017-02-03 16:02:17 +0100 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2017-02-03 16:09:08 +0100 |
| commit | 10e13d7a7e679360a2cb2bc22cd2b0d964c5acb6 (patch) | |
| tree | 1271f05883873a4f07699671ec86a39d481bce23 /tests | |
| parent | e47591f4aaa0221a187d3ea2f61c7ab5bb93ed54 (diff) | |
| download | websockify-10e13d7a7e679360a2cb2bc22cd2b0d964c5acb6.tar.gz | |
Remove last bits of Flash WebSocket emulation
We require native support from the browsers now.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/latency.html | 5 | ||||
| -rw-r--r-- | tests/load.html | 18 | ||||
| -rw-r--r-- | tests/plain_echo.html | 18 |
3 files changed, 0 insertions, 41 deletions
diff --git a/tests/latency.html b/tests/latency.html index 6297926..a25019c 100644 --- a/tests/latency.html +++ b/tests/latency.html @@ -274,11 +274,6 @@ window.onload = function() { console.log("onload"); - if (Websock_native) { - message("Using native WebSockets"); - } else { - message("initializing web-socket-js flash bridge"); - } var url = document.location.href; $D('host').value = (url.match(/host=([^&#]*)/) || ['',window.location.hostname])[1]; $D('port').value = (url.match(/port=([^&#]*)/) || ['',window.location.port])[1]; diff --git a/tests/load.html b/tests/load.html index ae31be3..11a6927 100644 --- a/tests/load.html +++ b/tests/load.html @@ -220,26 +220,8 @@ console.log("<< disconnect"); } - - /* If no builtin websockets then load web_socket.js */ - if (window.WebSocket) { - VNC_native_ws = true; - } else { - VNC_native_ws = false; - console.log("Loading web-socket-js flash bridge"); - var extra = "<script src='include/web-socket-js/swfobject.js'><\/script>"; - extra += "<script src='include/web-socket-js/FABridge.js'><\/script>"; - extra += "<script src='include/web-socket-js/web_socket.js'><\/script>"; - document.write(extra); - } - window.onload = function() { console.log("onload"); - if (!VNC_native_ws) { - console.log("initializing web-socket-js flash bridge"); - WebSocket.__swfLocation = "include/web-socket-js/WebSocketMain.swf"; - WebSocket.__initialize(); - } var url = document.location.href; $D('host').value = (url.match(/host=([^&#]*)/) || ['',''])[1]; $D('port').value = (url.match(/port=([^&#]*)/) || ['',''])[1]; diff --git a/tests/plain_echo.html b/tests/plain_echo.html index 83d7aa2..6d9a560 100644 --- a/tests/plain_echo.html +++ b/tests/plain_echo.html @@ -139,26 +139,8 @@ console.log("<< disconnect"); } - - /* If no builtin websockets then load web_socket.js */ - if (window.WebSocket) { - VNC_native_ws = true; - } else { - VNC_native_ws = false; - console.log("Loading web-socket-js flash bridge"); - var extra = "<script src='include/web-socket-js/swfobject.js'><\/script>"; - extra += "<script src='include/web-socket-js/FABridge.js'><\/script>"; - extra += "<script src='include/web-socket-js/web_socket.js'><\/script>"; - document.write(extra); - } - window.onload = function() { console.log("onload"); - if (!VNC_native_ws) { - console.log("initializing web-socket-js flash bridge"); - WebSocket.__swfLocation = "include/web-socket-js/WebSocketMain.swf"; - WebSocket.__initialize(); - } var url = document.location.href; $D('host').value = (url.match(/host=([^&#]*)/) || ['',''])[1]; $D('port').value = (url.match(/port=([^&#]*)/) || ['',''])[1]; |