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

Improve filter handling code

Browse source
This commit is contained in:
Calvin Montgomery 2014-12-28 11:12:37 -05:00
parent aa5e50f1d2
commit 25eba6ab2b
3 changed files with 77 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

20
www/js/ui.js
View file

@ -621,14 +621,7 @@ $("#cs-chatfilters-newsubmit").click(function () {
"match.");
}
try {
new RegExp(regex, flags);
} catch (e) {
alert("Regex error: " + e);
return;
}
socket.emit("updateFilter", {
socket.emit("addFilter", {
name: name,
source: regex,
flags: flags,
@ -636,10 +629,13 @@ $("#cs-chatfilters-newsubmit").click(function () {
active: true
});
$("#cs-chatfilters-newname").val("");
$("#cs-chatfilters-newregex").val("");
$("#cs-chatfilters-newflags").val("");
$("#cs-chatfilters-newreplace").val("");
socket.once("addFilterSuccess", function () {
console.log("addFilterSuccess");
$("#cs-chatfilters-newname").val("");
$("#cs-chatfilters-newregex").val("");
$("#cs-chatfilters-newflags").val("");
$("#cs-chatfilters-newreplace").val("");
});
});
$("#cs-emotes-newsubmit").click(function () {

10
www/js/util.js
View file

@ -2304,14 +2304,12 @@ function formatCSChatFilterList() {
f.flags = flags.val();
f.replace = replace.val();
f.filterlinks = filterlinks.prop("checked");
try {
new RegExp(f.source, f.flags);
} catch (e) {
alert("Invalid regex: " + e);
}
socket.emit("updateFilter", f);
reset();
socket.once("updateFilterSuccess", function () {
console.log("updateFilterSuccess");
reset();
});
});
control.data("editor", tr2);