rainbownapkin/fore.st
1
0
Fork 0
Code Issues 13 Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '3.0' into web-refactoring

Browse source
This commit is contained in:
calzoneman 2015-11-02 21:07:50 -08:00
commit 5ead24e45e
7 changed files with 26 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

1
www/js/callbacks.js
View file

@ -1138,7 +1138,6 @@ setupCallbacks = function() {
}
var opts = {
transports: ["websocket", "polling"],
secure: chosenServer.secure
};

17
www/js/util.js
View file

@ -624,23 +624,6 @@ function showUserOptions() {
$("#us-layout").val(USEROPTS.layout);
$("#us-no-channelcss").prop("checked", USEROPTS.ignore_channelcss);
$("#us-no-channeljs").prop("checked", USEROPTS.ignore_channeljs);
var conninfo = "<strong>Connection Information: </strong>" +
"Connected to <code>" + IO_URL + "</code> (";
if (IO_V6) {
conninfo += "IPv6, ";
} else {
conninfo += "IPv4, ";
}
if (IO_URL === IO_URLS["ipv4-ssl"] || IO_URL === IO_URLS["ipv6-ssl"]) {
conninfo += "SSL)";
} else {
conninfo += "no SSL)";
}
conninfo += ". SSL is enabled by default if it is supported by the server.";
$("#us-conninfo").html(conninfo);
$("#us-synch").prop("checked", USEROPTS.synch);
$("#us-synch-accuracy").val(USEROPTS.sync_accuracy);