safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-08 22:21:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'loadable-websocket-support' into unstable

Browse Source
This commit is contained in:
Michael Jumper
2012-03-09 12:33:37 -08:00
parent c524ba4914 7a266eb6b0
commit f9d6830ab5
3 changed files with 123 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
guacamole/src/main/webapp/WEB-INF/web.xml
View File

@@ -28,6 +28,11 @@
</session-timeout>
</session-config>
<!-- Automatically detect and load WebSocket support -->
<listener>
<listener-class>net.sourceforge.guacamole.net.basic.WebSocketSupportLoader</listener-class>
</listener>
<!-- Basic Login Servlet -->
<servlet>
<description>Login servlet.</description>

10
guacamole/src/main/webapp/client.xhtml
View File

@@ -101,10 +101,14 @@
window.onload = function() {
window.setTimeout(function() {
var tunnel;
// TODO: Detect WebSocket and websocket-tunnel
tunnel = new Guacamole.WebSocketTunnel("websocket-tunnel")
//tunnel = new Guacamole.HTTPTunnel("tunnel")
// Instantiate client
var guac = new Guacamole.Client(
new Guacamole.HTTPTunnel("tunnel")
);
var guac = new Guacamole.Client(tunnel);
// Add client to UI
guac.getDisplay().className = "software-cursor";