From 5a5016fd7918f3928a073d318b26d75d98fabe9d Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Sat, 13 Jul 2013 16:15:57 -0400
Subject: [PATCH] Change alt socket to socketio xhr-polling

---
 www/assets/js/callbacks.js | 32 +++++++++++++-------------------
 www/assets/js/data.js      |  3 +++
 www/assets/js/iourl.js     |  1 -
 www/assets/js/util.js      | 20 +-------------------
 4 files changed, 17 insertions(+), 39 deletions(-)

diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js
index 58362ed5..bbcfd7fd 100644
--- a/www/assets/js/callbacks.js
+++ b/www/assets/js/callbacks.js
@@ -1001,23 +1001,17 @@ setupCallbacks = function() {
     }
 }
 
-if(USEROPTS.altsocket) {
-    socket = new NotWebsocket();
-    setupCallbacks();
-}
-else {
-    $.getScript(IO_URL+"/socket.io/socket.io.js", function() {
-        try {
-            if(NO_WEBSOCKETS) {
-                var i = io.transports.indexOf("websocket");
-                if(i >= 0)
-                    io.transports.splice(i, 1);
-            }
-            socket = io.connect(IO_URL);
-            setupCallbacks();
+$.getScript(IO_URL+"/socket.io/socket.io.js", function() {
+    try {
+        if(NO_WEBSOCKETS) {
+            var i = io.transports.indexOf("websocket");
+            if(i >= 0)
+                io.transports.splice(i, 1);
         }
-        catch(e) {
-            Callbacks.disconnect();
-        }
-    });
-}
+        socket = io.connect(IO_URL);
+        setupCallbacks();
+    }
+    catch(e) {
+        Callbacks.disconnect();
+    }
+});
diff --git a/www/assets/js/data.js b/www/assets/js/data.js
index cb7a0fe4..48554008 100644
--- a/www/assets/js/data.js
+++ b/www/assets/js/data.js
@@ -21,6 +21,7 @@ var CLIENT = {
         text: ""
     }
 };
+var SUPERADMIN = false;
 
 var CHANNEL = {
     opts: {},
@@ -113,6 +114,8 @@ var USEROPTS = {
     ignore_channeljs     : getOrDefault("ignore_channeljs", false)
 };
 
+var NO_WEBSOCKETS = USEROPTS.altsocket;
+
 var Rank = {
     Guest: 0,
     Member: 1,
diff --git a/www/assets/js/iourl.js b/www/assets/js/iourl.js
index 9aa8b2ef..19f76b90 100644
--- a/www/assets/js/iourl.js
+++ b/www/assets/js/iourl.js
@@ -11,4 +11,3 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 var IO_URL = "http://localhost:1337";
 var WEB_URL = "http://localhost:8080";
-var NO_WEBSOCKETS = false;
diff --git a/www/assets/js/util.js b/www/assets/js/util.js
index 0a36997c..c4afd662 100644
--- a/www/assets/js/util.js
+++ b/www/assets/js/util.js
@@ -478,7 +478,7 @@ function showOptionsMenu() {
     addOption("Send Button", sendbtncontainer);
 
     var altsocketcontainer = $("<label/>").addClass("checkbox")
-        .text("Use alternative socket connection");
+        .text("Use alternative socket connection (requires refresh)");
     var altsocket = $("<input/>").attr("type", "checkbox")
         .appendTo(altsocketcontainer);
     altsocket.prop("checked", USEROPTS.altsocket);
@@ -594,24 +594,6 @@ function applyOpts() {
             }
         });
     }
-
-    if(USEROPTS.altsocket) {
-        if(!socket.nws) {
-            if(socket && socket.disconnect)
-                socket.disconnect();
-            socket = new NotWebsocket();
-            setupCallbacks();
-        }
-    }
-    // Switch from NotWebsocket => Socket.io
-    else if(socket && typeof socket.poll !== "undefined") {
-        try {
-            socket = io.connect(IO_URL);
-            setupCallbacks();
-        }
-        catch(e) {
-        }
-    }
 }
 
 applyOpts();