jeena/chuck.js
1
0
Fork 0
mirror of https://github.com/logsol/chuck.js.git synced 2026-05-11 10:37:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

changed style and clearTimeout

Browse source
This commit is contained in:
Jeena 2014-06-29 00:04:43 +02:00
parent 9e6c42f221
commit e74c7b8219
3 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
static/css/screen.css
View file

@ -12,6 +12,11 @@ body {
display: table; display: table;
} }
#back-to-menu {
display: inline-block;
margin: 10px;
}
::selection { ::selection {
background: #607950; /* Safari */ background: #607950; /* Safari */
} }
@ -99,7 +104,7 @@ canvas {
right: 0; right: 0;
top: 0; top: 0;
padding: 10px; padding: 10px;
background: #222; background: #333;
} }
#devtools p { #devtools p {

2
static/html/index.html
View file

@ -71,7 +71,7 @@
</form> </form>
</article> </article>
<article id="game"> <article id="game">
<button onclick="window.location.href='/'">Menu</button> <button id="back-to-menu" onclick="window.location.href='/'">Menu</button>
<div id="canvasContainer"> <div id="canvasContainer">
<canvas id="canvas"></canvas> <canvas id="canvas"></canvas>
</div> </div>

14
static/js/menu.js
View file

@ -167,7 +167,7 @@ if(!Chuck) var Chuck = {};
function startTimer(seconds) { function startTimer(seconds) {
var now = new Date(); var now = new Date();
var end = new Date(now.getTime() + seconds * 1000); var end = new Date(now.getTime() + seconds * 1000);
setInterval(function() { channelDestructionTimeout = setInterval(function() {
now = new Date(); now = new Date();
var diff = new Date(end.getTime() - now.getTime()); var diff = new Date(end.getTime() - now.getTime());
if(diff.getTime() < 0) { if(diff.getTime() < 0) {
@ -263,6 +263,15 @@ if(!Chuck) var Chuck = {};
$("#menu").style.display = "none"; $("#menu").style.display = "none";
$("#game").style.display = "block"; $("#game").style.display = "block";
Chuck.run(channelName, nickname); Chuck.run(channelName, nickname);
if(refreshInterval) {
clearInterval(refreshInterval);
}
if(channelDestructionTimeout) {
clearInterval(channelDestructionTimeout);
}
} }
} }
@ -301,7 +310,8 @@ if(!Chuck) var Chuck = {};
$("#refresh").onclick = refresh; $("#refresh").onclick = refresh;
refresh(); refresh();
setInterval(refresh, 5000); var channelDestructionTimeout = null;
var refreshInterval = setInterval(refresh, 5000);
Chuck.menu = { Chuck.menu = {
show: show show: show