This commit is contained in:
calzoneman 2013-06-22 19:02:55 -04:00
parent 71b774b445
commit 8c9cbca4c4
4 changed files with 23 additions and 1 deletions

View File

@ -24,6 +24,7 @@ var Rank = require("./rank.js");
var Auth = require("./auth.js"); var Auth = require("./auth.js");
var ChatCommand = require("./chatcommand.js"); var ChatCommand = require("./chatcommand.js");
var Filter = require("./filter.js").Filter; var Filter = require("./filter.js").Filter;
var ActionLog = require("./actionlog");
var Channel = function(name) { var Channel = function(name) {
Logger.syslog.log("Opening channel " + name); Logger.syslog.log("Opening channel " + name);

View File

@ -770,6 +770,7 @@ Callbacks = {
}, },
searchResults: function(data) { searchResults: function(data) {
$("#search_clear").remove();
clearSearchResults(); clearSearchResults();
$("#library").data("entries", data.results); $("#library").data("entries", data.results);
if(data.results.length > 100) { if(data.results.length > 100) {
@ -789,6 +790,13 @@ Callbacks = {
})(i); })(i);
} }
} }
$("<button/>").addClass("btn btn-block")
.attr("id", "search_clear")
.text("Clear Results")
.click(function() {
clearSearchResults();
})
.insertBefore($("#library"));
loadSearchPage(0); loadSearchPage(0);
}, },

View File

@ -22,6 +22,9 @@
}); });
clickHandler("#show_optedit", "#optedit"); clickHandler("#show_optedit", "#optedit");
$("#optedit input[type='text']").keydown(function(ev) {
return ev.keyCode != 13;
});
clickHandler("#show_permedit", "#permedit"); clickHandler("#show_permedit", "#permedit");
clickHandler("#show_motdedit", "#motdedit"); clickHandler("#show_motdedit", "#motdedit");
clickHandler("#show_filteredit", "#filteredit"); clickHandler("#show_filteredit", "#filteredit");

View File

@ -666,6 +666,7 @@ function showPollMenu() {
title: title.val(), title: title.val(),
opts: opts opts: opts
}); });
menu.remove();
}); });
} }
@ -793,6 +794,7 @@ function handlePermissionChange() {
function clearSearchResults() { function clearSearchResults() {
$("#library").html(""); $("#library").html("");
$("#search_clear").remove();
$("#search_pagination").remove(); $("#search_pagination").remove();
} }
@ -1174,6 +1176,14 @@ function genPermissionsEditor() {
["Channel Admin", "3"] ["Channel Admin", "3"]
]; ];
var noanon = [
["Guest" , "0"],
["Registered" , "1"],
["Leader" , "1.5"],
["Moderator" , "2"],
["Channel Admin", "3"]
];
var modleader = [ var modleader = [
["Leader" , "1.5"], ["Leader" , "1.5"],
["Moderator" , "2"], ["Moderator" , "2"],
@ -1218,7 +1228,7 @@ function genPermissionsEditor() {
addDivider("Misc"); addDivider("Misc");
makeOption("Drink calls", "drink", modleader, CHANNEL.perms.drink+""); makeOption("Drink calls", "drink", modleader, CHANNEL.perms.drink+"");
makeOption("Chat", "chat", standard, CHANNEL.perms.chat+""); makeOption("Chat", "chat", noanon, CHANNEL.perms.chat+"");
var submit = $("<button/>").addClass("btn btn-primary").appendTo(fs); var submit = $("<button/>").addClass("btn btn-primary").appendTo(fs);
submit.text("Save"); submit.text("Save");