From: Michael Jumper <zhangmaike@users.sourceforge.net>
Date: Fri, 9 Mar 2012 20:42:56 +0000 (-0800)
Subject: Test for WebSocket, default to HTTP.
X-Git-Url: http://git.alex.org.uk

Test for WebSocket, default to HTTP.
---

diff --git a/src/main/webapp/client.xhtml b/src/main/webapp/client.xhtml
index 1a319ea..ba9a5a4 100644
--- a/src/main/webapp/client.xhtml
+++ b/src/main/webapp/client.xhtml
@@ -103,9 +103,13 @@
 
                     var tunnel;
 
-                    // TODO: Detect WebSocket and websocket-tunnel
-                    tunnel = new Guacamole.WebSocketTunnel("websocket-tunnel")
-                    //tunnel = new Guacamole.HTTPTunnel("tunnel")
+                    // If WebSocket available, try to use it.
+                    if (window.WebSocket)
+                        tunnel = new Guacamole.WebSocketTunnel("websocket-tunnel")
+
+                    // If no WebSocket, then use HTTP.
+                    else
+                        tunnel = new Guacamole.HTTPTunnel("tunnel")
 
                     // Instantiate client
                     var guac = new Guacamole.Client(tunnel);