Fixes, rate limiting

www/assets/js/callbacks.js

@@ -846,3 +846,9 @@ $.getScript(IO_URL+"/socket.io/socket.io.js", function() {
         Callbacks.disconnect();
     }
 });
+
+window.setupNewSocket = function() {
+    for(var key in Callbacks) {
+        socket.on(key, Callbacks[key]);
+    }
+}

www/assets/js/functions.js

@@ -1129,6 +1129,9 @@ function saveOpts() {
     }
 }
 
+// To be overridden in callbacks.js
+function setupNewSocket() { }
+
 function applyOpts() {
     $("#usertheme").remove();
     if(USEROPTS.theme != "default") {
@@ -1189,22 +1192,18 @@ function applyOpts() {
     }
 
     if(USEROPTS.altsocket) {
-        socket.disconnect();
+        if(socket)
+            socket.disconnect();
         socket = new NotWebsocket();
-        for(var key in Callbacks) {
-            socket.on(key, Callbacks[key]);
-        }
+        setupNewSocket();
     }
     // Switch from NotWebsocket => Socket.io
     else if(socket && typeof socket.poll !== "undefined") {
         try {
             socket = io.connect(IO_URL);
-            for(var key in Callbacks) {
-                socket.on(key, Callbacks[key]);
-            }
+            setupNewSocket();
         }
         catch(e) {
-            Callbacks.disconnect();
         }
     }
 }

www/assets/js/notwebsocket.js

@@ -118,3 +118,4 @@ NotWebsocket.prototype.disconnect = function() {
         this.reconnect();
     }.bind(this), this.reconndelay);
 }
+

www/channel.html

@@ -310,10 +310,10 @@
     <script src="./assets/js/jquery.js"></script>
     <!-- My Javascript -->
     <script src="./assets/js/iourl.js"></script>
+    <script src="./assets/js/notwebsocket.js"></script>
     <script src="./assets/js/media.js"></script>
     <script src="./assets/js/functions.js"></script>
     <script src="./assets/js/client.js"></script>
-    <script src="./assets/js/notwebsocket.js"></script>
     <script src="./assets/js/callbacks.js"></script>
     <!-- APIs -->
     <script src="http://api.dmcdn.net/all.js"></script>