Merge pull request #27 from brunobg/patch-2

Better test for websocket support
jxcore · Sep 1, 2015 · 68d6421 · 68d6421
2 parents acb2154 + e40f222
commit 68d6421
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/backend/jx_browser_client.txt b/backend/jx_browser_client.txt
@@ -16,6 +16,7 @@
     jxcore.ieVersion=0;
     jxcore.isIE = /MSIE/i.test(_ua);
     jxcore.isAndroid = /Android/i.test(_ua);
+    jxcore.hasWebsocket = ('WebSocket' in window || 'MozWebSocket' in window);
     jxcore.isIOS = /Mobile/i.test(_ua) && /Apple/i.test(_ua);
     jxcore.isOpera = /Opera/i.test(_ua);
     jxcore.isChrome = /Chrome/i.test(_ua);
@@ -577,7 +578,7 @@
             return false;
         }
 
-        if(jxcore.SocketURL==null || jxcore.isAndroid || (jxcore.isIE && jxcore.ieVersion<9)) {
+        if(jxcore.SocketURL==null || !jxcore.hasWebsocket || (jxcore.isIE && jxcore.ieVersion<9)) {
             jxcore.SocketDisabled = true;
             return false;
         }