diff --git a/channel.js b/channel.js
index 28396245..214a1b0a 100644
--- a/channel.js
+++ b/channel.js
@@ -24,6 +24,7 @@ var Rank = require("./rank.js");
var Auth = require("./auth.js");
var ChatCommand = require("./chatcommand.js");
var Filter = require("./filter.js").Filter;
+var ActionLog = require("./actionlog");
var Channel = function(name) {
Logger.syslog.log("Opening channel " + name);
diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js
index d904f68c..a6183d37 100644
--- a/www/assets/js/callbacks.js
+++ b/www/assets/js/callbacks.js
@@ -770,6 +770,7 @@ Callbacks = {
},
searchResults: function(data) {
+ $("#search_clear").remove();
clearSearchResults();
$("#library").data("entries", data.results);
if(data.results.length > 100) {
@@ -789,6 +790,13 @@ Callbacks = {
})(i);
}
}
+ $("").addClass("btn btn-block")
+ .attr("id", "search_clear")
+ .text("Clear Results")
+ .click(function() {
+ clearSearchResults();
+ })
+ .insertBefore($("#library"));
loadSearchPage(0);
},
diff --git a/www/assets/js/channelsettings.js b/www/assets/js/channelsettings.js
index b8b2b682..5ea54330 100644
--- a/www/assets/js/channelsettings.js
+++ b/www/assets/js/channelsettings.js
@@ -22,6 +22,9 @@
});
clickHandler("#show_optedit", "#optedit");
+ $("#optedit input[type='text']").keydown(function(ev) {
+ return ev.keyCode != 13;
+ });
clickHandler("#show_permedit", "#permedit");
clickHandler("#show_motdedit", "#motdedit");
clickHandler("#show_filteredit", "#filteredit");
diff --git a/www/assets/js/util.js b/www/assets/js/util.js
index 73fab1a8..7d5f171c 100644
--- a/www/assets/js/util.js
+++ b/www/assets/js/util.js
@@ -666,6 +666,7 @@ function showPollMenu() {
title: title.val(),
opts: opts
});
+ menu.remove();
});
}
@@ -793,6 +794,7 @@ function handlePermissionChange() {
function clearSearchResults() {
$("#library").html("");
+ $("#search_clear").remove();
$("#search_pagination").remove();
}
@@ -1174,6 +1176,14 @@ function genPermissionsEditor() {
["Channel Admin", "3"]
];
+ var noanon = [
+ ["Guest" , "0"],
+ ["Registered" , "1"],
+ ["Leader" , "1.5"],
+ ["Moderator" , "2"],
+ ["Channel Admin", "3"]
+ ];
+
var modleader = [
["Leader" , "1.5"],
["Moderator" , "2"],
@@ -1218,7 +1228,7 @@ function genPermissionsEditor() {
addDivider("Misc");
makeOption("Drink calls", "drink", modleader, CHANNEL.perms.drink+"");
- makeOption("Chat", "chat", standard, CHANNEL.perms.chat+"");
+ makeOption("Chat", "chat", noanon, CHANNEL.perms.chat+"");
var submit = $("").addClass("btn btn-primary").appendTo(fs);
submit.text("Save");