diff --git a/templates/useroptions.jade b/templates/useroptions.jade
index 43feea92..4b404a95 100644
--- a/templates/useroptions.jade
+++ b/templates/useroptions.jade
@@ -119,5 +119,4 @@ mixin us-mod
h4 Moderator Preferences
form.form-horizontal(action="javascript:void(0)")
mixin rcheckbox("us-modflair", "Show name color")
- mixin rcheckbox("us-joinmessage", "Show join messages")
mixin rcheckbox("us-shadowchat", "Show shadowmuted messages")
diff --git a/www/js/callbacks.js b/www/js/callbacks.js
index d3ed54b4..7b297c03 100644
--- a/www/js/callbacks.js
+++ b/www/js/callbacks.js
@@ -155,29 +155,6 @@ Callbacks = {
"channels page.");
},
- registerChannel: function(data) {
- if ($("#chanregisterbtn").length > 0) {
- $("#chanregisterbtn").text("Register it")
- .attr("disabled", false);
- }
- if(data.success) {
- $("#chregnotice").remove();
- }
- else {
- makeAlert("Error", data.error, "alert-danger")
- .insertAfter($("#chregnotice"));
- }
- },
-
- unregisterChannel: function(data) {
- if(data.success) {
- alert("Channel unregistered");
- }
- else {
- alert(data.error);
- }
- },
-
setMotd: function(motd) {
CHANNEL.motd = motd;
$("#motd").html(motd);
@@ -342,30 +319,6 @@ Callbacks = {
formatCSBanlist();
},
- recentLogins: function(entries) {
- var tbl = $("#loginhistory table");
- // I originally added this check because of a race condition
- // Now it seems to work without but I don't trust it
- if(!tbl.hasClass("table")) {
- setTimeout(function() {
- Callbacks.recentLogins(entries);
- }, 100);
- return;
- }
- if(tbl.children().length > 1) {
- $(tbl.children()[1]).remove();
- }
- for(var i = 0; i < entries.length; i++) {
- var tr = document.createElement("tr");
- var name = $("
| ").text(entries[i].name).appendTo(tr);
- var aliases = $(" | ").text(entries[i].aliases.join(", ")).appendTo(tr);
- var time = new Date(entries[i].time).toTimeString();
- $(" | ").text(time).appendTo(tr);
-
- $(tr).appendTo(tbl);
- }
- },
-
channelRanks: function(entries) {
var tbl = $("#cs-chanranks table");
tbl.data("entries", entries);
@@ -515,11 +468,6 @@ Callbacks = {
}
},
- joinMessage: function(data) {
- if(USEROPTS.joinmessage)
- addChatMessage(data);
- },
-
clearchat: function() {
$("#messagebuffer").html("");
LASTCHAT.name = "";
diff --git a/www/js/data.js b/www/js/data.js
index 051b2df2..5dbfacb7 100644
--- a/www/js/data.js
+++ b/www/js/data.js
@@ -106,7 +106,6 @@ var USEROPTS = {
wmode_transparent : getOrDefault("wmode_transparent", true),
chatbtn : getOrDefault("chatbtn", false),
altsocket : getOrDefault("altsocket", false),
- joinmessage : getOrDefault("joinmessage", true),
qbtn_hide : getOrDefault("qbtn_hide", false),
qbtn_idontlikechange : getOrDefault("qbtn_idontlikechange", false),
first_visit : getOrDefault("first_visit", true),
diff --git a/www/js/util.js b/www/js/util.js
index 9b15c938..372d19ce 100644
--- a/www/js/util.js
+++ b/www/js/util.js
@@ -642,7 +642,6 @@ function showUserOptions() {
$("#us-no-emotes").prop("checked", USEROPTS.no_emotes);
$("#us-modflair").prop("checked", USEROPTS.modhat);
- $("#us-joinmessage").prop("checked", USEROPTS.joinmessage);
$("#us-shadowchat").prop("checked", USEROPTS.show_shadowchat);
formatScriptAccessPrefs();
@@ -677,7 +676,6 @@ function saveUserOptions() {
if (CLIENT.rank >= 2) {
USEROPTS.modhat = $("#us-modflair").prop("checked");
- USEROPTS.joinmessage = $("#us-joinmessage").prop("checked");
USEROPTS.show_shadowchat = $("#us-shadowchat").prop("checked");
}