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

Remove prompts, mostly

This commit is contained in:
Neale Pickett 2014-01-18 23:33:43 -07:00
parent e85a1d084c
commit d3054c4e1d
3 changed files with 100 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TODO
View File

@ -1,2 +1,5 @@
* During setup, make period time and scores input fields
* Display clickable timing presets during setup
* A popup logo browser would be nice
* use chrome.mediaGalleries to load logos * use chrome.mediaGalleries to load logos
* use chrome.power to keep the display on * use chrome.power to keep the display on

159
res/scoreboard.js
View File

@ -1,19 +1,19 @@
/* /*
* LADD Roller Derby Scoreboard LADD Roller Derby Scoreboard
* Copyright © 2011 Neale Pickett <neale@woozle.org> Copyright © 2014 Neale Pickett <neale@woozle.org>
*
* This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or (at the Free Software Foundation, either version 3 of the License, or
* your option) any later version. (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details. General Public License for more details.
*
* You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
/* You can only have one scoreboard per page. This limitation is mostly /* You can only have one scoreboard per page. This limitation is mostly
@ -24,21 +24,21 @@
* change in this file. * change in this file.
*/ */
/* Tunables */ /* Times for various rulesets */
jam_time = 120000; var presets = [
lineup_time = 30000; ["WFTDA", 1800, 120, 30],
period_time = 1800000; ["USARS", 1800, 90, 30],
var presets = { ["MADE", 900, 90, 30]
"WFTDA": [1800, 120, 30], ];
"USARS": [1800, 90, 30], var period_time = presets[0][1] * 1000;
"MADE": [900, 90, 30] var jam_time = presets[0][2] * 1000;
} var lineup_time = presets[0][3] * 1000;
/* State names */ /* State names */
var SETUP = 0; // !P 30:00 !J 2:00 var SETUP = 0;
var JAM = 1; // P J 2:00 var JAM = 1;
var LINEUP = 2; // P J 1:00 var LINEUP = 2;
var TIMEOUT = 3; // !P J 1:00 var TIMEOUT = 3;
var periodtext = [ var periodtext = [
chrome.i18n.getMessage("timeToGame"), chrome.i18n.getMessage("timeToGame"),
@ -195,6 +195,8 @@ function transition(newstate) {
// Reset lead jammer indicators // Reset lead jammer indicators
e("jammer-a").className = ""; e("jammer-a").className = "";
e("jammer-b").className = ""; e("jammer-b").className = "";
save();
} }
@ -317,15 +319,10 @@ function handle(event) {
break; break;
case "periodtext": case "periodtext":
var pt; var pt;
var ptl = periodtext.length;
if (mod) { period = (period + ptl + adj) % ptl;
pt = prompt("Enter new period indicator text", tgt.innerHTML); pt = periodtext[period];
} else {
var ptl = periodtext.length;
period = (period + ptl + adj) % ptl;
pt = periodtext[period];
}
if (pt) { if (pt) {
tgt.innerHTML = pt; tgt.innerHTML = pt;
if (state == TIMEOUT) { if (state == TIMEOUT) {
@ -348,17 +345,11 @@ function handle(event) {
case "score-a": case "score-a":
case "score-b": case "score-b":
if (state == SETUP) { if (state == SETUP) {
var s = prompt("Enter score for team " + team, tgt.innerHTML); e(tgt.id).innerHTML = 0;
if (s) {
tgt.innerHTML = s;
}
} else { } else {
score(team, adj); score(team, adj);
} }
break; break;
case "prefs":
chrome.app.window.create("../options.html");
break;
case "close": case "close":
window.close(); window.close();
break; break;
@ -479,22 +470,54 @@ function key(event) {
function save() { function save() {
chrome.storage.local.set( chrome.storage.local.set(
{ {
"period_clock": e("period").remaining(),
"score_a": e("score-a").innerHTML,
"score_b": e("score-b").innerHTML,
"name_a": e("name-a").innerHTML,
"name_b": e("name-b").innerHTML,
"logo_a": e("logo-a").src,
"logo_b": e("logo-b").src,
"period_time": period_time, "period_time": period_time,
"jam_time": jam_time, "jam_time": jam_time,
"lineup_time": lineup_time, "lineup_time": lineup_time,
"logo_a": e("logo-a").src,
"logo_b": e("logo-b").src,
"score_a": e("score-a").innerHTML,
"score_b": e("score-b").innerHTML,
"timeouts_a": e("timeouts-a").innerHTML,
"timeouts_b": e("timeouts-b").innerHTML,
"period_clock": e("period").remaining(),
} }
); );
} }
function load() {
function load_cb(state) {
period_time = state.period_time;
jam_time = state.jam_time;
lineup_time = state.lineup_time;
e("logo-a").src = state.logo_a;
e("logo-b").src = state.logo_b;
e("score-a").innerHTML = state.score_a;
e("score-b").innerHTML = state.score_b;
e("timeouts-a").innerHTML = state.timeouts_a;
e("timeouts-b").innerHTML = state.timeouts_b;
var p = e("period");
startTimer(p);
p.set(state.period_clock);
}
chrome.storage.local.get({
"period_clock": period_time,
"score_a": 0,
"score_b": 0,
"logo_a": "logos/black.png",
"logo_b": "logos/white.png",
"timeouts_a": 3,
"timeouts_b": 3,
"period_time": period_time,
"jam_time": jam_time,
"lineup_time": lineup_time
}, load_cb);
}
function ei(name) { function ei(name) {
el = e(name); el = e(name);
if (el.addEventListener) { if (el.addEventListener) {
@ -505,32 +528,16 @@ function ei(name) {
function start() { function start() {
resize(); resize();
load();
var p = document.getElementById("period"); ei("logo-a");
var j = document.getElementById("jam"); ei("logo-b");
var c; ei("score-a");
ei("score-b")
// XXX: I think, instead of null, you can pass in a dictionary of defaults
function load(state) {
ei("name-a").innerHTML = state.name_a || "Home";
ei("name-b").innerHTML = state.name_b || "Vis";
ei("logo-a").src = state.logo_a || "logos/black.png";
ei("logo-b").src = state.logo_b || "logos/white.png";
ei("score-a").innerHTML = state.score_a || 0;
ei("score-b").innerHTML = state.score_b || 0;
ei("timeouts-a").innerHTML = state.timeout_a || 3;
ei("timeouts-b").innerHTML = state.timeout_b || 3;
period = state.period || 0;
jamno = state.jamno || 0;
var c = state.period_clock || 1800000;
startTimer(p);
p.set(c);
}
chrome.storage.local.get(null, load);
ei("jammer-a"); ei("jammer-a");
ei("jammer-b"); ei("jammer-b");
ei("timeouts-a");
ei("timeouts-b");
ei("period"); ei("period");
ei("jam"); ei("jam");
ei("prefs"); ei("prefs");
@ -540,10 +547,10 @@ function start() {
ei("jamtext").innerHTML = jamtext[3]; ei("jamtext").innerHTML = jamtext[3];
transition(); transition();
var j = e("jam");
startTimer(j); startTimer(j);
j.set(jam_time); j.set(jam_time);
save_timer = setInterval(save, 10000); // Every 10 seconds
update_itimer = setInterval(update, 200); // 5 times a second update_itimer = setInterval(update, 200); // 5 times a second
} }

33
scoreboard.html
View File

@ -1,20 +1,20 @@
<!DOCTYPE html> <!DOCTYPE html>
<!-- <!--
Roller Derby Scoreboard Copyright © 2011 Neale Pickett LADD Roller Derby Scoreboard
Copyright © 2014 Neale Pickett <neale@woozle.org>
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, but This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details. General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see along with this program. If not, see <http://www.gnu.org/licenses/>.
<http://www.gnu.org/licenses/>.
--> -->
<html> <html>
<head> <head>
@ -25,15 +25,10 @@
<script type="text/javascript" src="res/scoreboard.js"></script> <script type="text/javascript" src="res/scoreboard.js"></script>
</head> </head>
<body> <body>
<!--
HTML5 says not to use tables for layout. Since this is
a highly-styled page, it looks awful without CSS. Sorry.
-->
<div id="scoreboard"> <div id="scoreboard">
<p class="left"> <p class="left">
<img class="logo" id="logo-a" src="" alt="A"> <img class="logo" id="logo-a" src="" alt="A">
<span class="timeouts" id="timeouts-a">0</span> <span class="timeouts" id="timeouts-a">3</span>
<span class="jammer" id="jammer-a">★</span> <span class="jammer" id="jammer-a">★</span>
<span class="score" id="score-a">-</span> <span class="score" id="score-a">-</span>
</p> </p>
@ -47,7 +42,7 @@
<p class="right"> <p class="right">
<img class="logo" id="logo-b" src="" alt="B"> <img class="logo" id="logo-b" src="" alt="B">
<span class="timeouts" id="timeouts-b">0</span> <span class="timeouts" id="timeouts-b">3</span>
<span class="jammer" id="jammer-b">★</span> <span class="jammer" id="jammer-b">★</span>
<span class="score" id="score-b">-</span> <span class="score" id="score-b">-</span>
</p> </p>