neale
/
woozle-scoreboard
mirror of https://github.com/nealey/woozle-scoreboard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into overlay

This commit is contained in:
Neale Pickett 2014-02-15 20:19:48 -07:00
parent 657ca0b23d c3f4a227ef
commit adfb1e7368
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
res/scoreboard.js
View File

@ -245,7 +245,7 @@ function transition(newstate) {
*/ */
var notices = { var notices = {
"banana": '<img src="res/banana.gif">' "banana": '<img src="banana.gif">'
}; };
var notice_timer; var notice_timer;
@ -628,10 +628,10 @@ function fgColor(color) {
for (var i = 0; i < 3; i += 1) { for (var i = 0; i < 3; i += 1) {
v += parseInt(color.substr(1+i*2, 2), 16) v += parseInt(color.substr(1+i*2, 2), 16)
} }
if (v / 3 >= 0x88) { if (v / 3 < 0x88) {
return "#000000"
} else {
return "#ffffff" return "#ffffff"
} else {
return "#000000"
} }
} }