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

Improve announcements; remove debug console.log

Browse source
This commit is contained in:
calzoneman 2013-05-16 22:48:37 -04:00
parent 8da604fd8a
commit 767cfdd76e
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
channel.js
View file

@ -59,7 +59,7 @@ var Channel = function(name) {
new Filter("monospace", "`([^`]+)`", "g", "<code>$1</code>"), new Filter("monospace", "`([^`]+)`", "g", "<code>$1</code>"),
new Filter("bold", "(.)\\*([^\\*]+)\\*", "g", "$1<strong>$2</strong>"), new Filter("bold", "(.)\\*([^\\*]+)\\*", "g", "$1<strong>$2</strong>"),
new Filter("italic", "(^| )_([^_]+)_", "g", "$1<em>$2</em>"), new Filter("italic", "(^| )_([^_]+)_", "g", "$1<em>$2</em>"),
new Filter("inline spoiler", "\\[spoiler\\](.*)\\[\\/spoiler\\]", "ig", "<span class=\"spoiler\">$1</span>") new Filter("inline spoiler", "\\[spoiler\\](.*)\\[\\/spoiler\\]", "ig", "<span class=\"spoiler\">$1</span>"),
]; ];
this.motd = { this.motd = {
motd: "", motd: "",

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

@ -27,8 +27,10 @@ Callbacks = {
}, },
announcement: function(data) { announcement: function(data) {
$("#announcerow").html("");
$("#announcerow").css("display", "");
var div = $("<div/>").addClass("alert") var div = $("<div/>").addClass("alert")
.insertAfter($(".row")[0]); .appendTo($("#announcerow"));
$("<button/>").addClass("close pull-right").text("×") $("<button/>").addClass("close pull-right").text("×")
.appendTo(div) .appendTo(div)
.click(function() { div.remove(); }); .click(function() { div.remove(); });

2
www/channel.html
View file

@ -53,6 +53,8 @@
<h1 id="drinkcount"></h1> <h1 id="drinkcount"></h1>
</div> </div>
</div> </div>
<div class="row-fluid" id="announcerow" style="display: none">
</div>
<div class="row" id="main" style="margin-top: 20px;"> <div class="row" id="main" style="margin-top: 20px;">
<div class="span5" id="chatdiv"> <div class="span5" id="chatdiv">
<p id="usercount"></p> <p id="usercount"></p>