moon
/
sync
mirror of https://github.com/calzoneman/sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change alt socket to socketio xhr-polling

This commit is contained in:
calzoneman 2013-07-13 16:15:57 -04:00
parent 07795feffa
commit 5a5016fd79
4 changed files with 17 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
www/assets/js/callbacks.js
View File

@ -1001,23 +1001,17 @@ setupCallbacks = function() {
} }
} }
if(USEROPTS.altsocket) { $.getScript(IO_URL+"/socket.io/socket.io.js", function() {
socket = new NotWebsocket(); try {
setupCallbacks(); if(NO_WEBSOCKETS) {
} var i = io.transports.indexOf("websocket");
else { if(i >= 0)
$.getScript(IO_URL+"/socket.io/socket.io.js", function() { io.transports.splice(i, 1);
try {
if(NO_WEBSOCKETS) {
var i = io.transports.indexOf("websocket");
if(i >= 0)
io.transports.splice(i, 1);
}
socket = io.connect(IO_URL);
setupCallbacks();
} }
catch(e) { socket = io.connect(IO_URL);
Callbacks.disconnect(); setupCallbacks();
} }
}); catch(e) {
} Callbacks.disconnect();
}
});

3
www/assets/js/data.js
View File

@ -21,6 +21,7 @@ var CLIENT = {
text: "" text: ""
} }
}; };
var SUPERADMIN = false;
var CHANNEL = { var CHANNEL = {
opts: {}, opts: {},
@ -113,6 +114,8 @@ var USEROPTS = {
ignore_channeljs : getOrDefault("ignore_channeljs", false) ignore_channeljs : getOrDefault("ignore_channeljs", false)
}; };
var NO_WEBSOCKETS = USEROPTS.altsocket;
var Rank = { var Rank = {
Guest: 0, Guest: 0,
Member: 1, Member: 1,

1
www/assets/js/iourl.js
View File

@ -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 IO_URL = "http://localhost:1337";
var WEB_URL = "http://localhost:8080"; var WEB_URL = "http://localhost:8080";
var NO_WEBSOCKETS = false;

20
www/assets/js/util.js
View File

@ -478,7 +478,7 @@ function showOptionsMenu() {
addOption("Send Button", sendbtncontainer); addOption("Send Button", sendbtncontainer);
var altsocketcontainer = $("<label/>").addClass("checkbox") var altsocketcontainer = $("<label/>").addClass("checkbox")
.text("Use alternative socket connection"); .text("Use alternative socket connection (requires refresh)");
var altsocket = $("<input/>").attr("type", "checkbox") var altsocket = $("<input/>").attr("type", "checkbox")
.appendTo(altsocketcontainer); .appendTo(altsocketcontainer);
altsocket.prop("checked", USEROPTS.altsocket); 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(); applyOpts();