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

Merge pull request #428 from calzoneman/sanitize-html

Browse source 
Merge sanitize-html into 3.0 #yolo
This commit is contained in:
Calvin Montgomery 2015-01-14 13:23:01 -06:00
commit d7ef0d1893
7 changed files with 75 additions and 276 deletions
Download patch file Download diff file Expand all files Collapse all files

9
www/js/callbacks.js
View file

@ -175,11 +175,10 @@ Callbacks = {
}
},
setMotd: function(data) {
CHANNEL.motd = data.html;
CHANNEL.motd_text = data.motd;
$("#motd").html(CHANNEL.motd);
$("#cs-motdtext").val(CHANNEL.motd_text);
setMotd: function(motd) {
CHANNEL.motd = motd;
$("#motd").html(motd);
$("#cs-motdtext").val(motd);
if (data.motd != "") {
$("#motdwrap").show();
$("#motd").show();

1
www/js/data.js
View file

@ -19,7 +19,6 @@ var CHANNEL = {
css: "",
js: "",
motd: "",
motd_text: "",
name: false,
usercount: 0,
emotes: []

2
www/js/util.js
View file

@ -900,7 +900,7 @@ function handleModPermissions() {
})();
$("#cs-csstext").val(CHANNEL.css);
$("#cs-jstext").val(CHANNEL.js);
$("#cs-motdtext").val(CHANNEL.motd_text);
$("#cs-motdtext").val(CHANNEL.motd);
setParentVisible("a[href='#cs-motdeditor']", hasPermission("motdedit"));
setParentVisible("a[href='#cs-permedit']", CLIENT.rank >= 3);
setParentVisible("a[href='#cs-banlist']", hasPermission("ban"));