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

Merge master into dev

Browse source
This commit is contained in:
calzoneman 2013-07-03 16:06:13 -04:00
commit 860d81afbc
5 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
www/assets/js/callbacks.js
View file

@ -106,8 +106,9 @@ Callbacks = {
setMotd: function(data) {
CHANNEL.motd = data.html;
CHANNEL.motd_text = data.motd;
$("#motd").html(data.html);
$("#motdtext").val(CHANNEL.motd);
$("#motdtext").val(CHANNEL.motd_text);
if(data.motd != "")
$("#motd").show();
else