Mercurial > hg > nodescore
changeset 6:33e6dc370ef7
fixed css
| author | tzara <rc-web@kiben.net> |
|---|---|
| date | Wed, 04 Jul 2012 21:24:36 +0000 |
| parents | 9070b2a7ca65 |
| children | 40253bcfce03 |
| files | INSTALL www/m/.#1.html www/m/1.html www/m/2.html www/m/3.html www/m/4.html www/m/controls.html www/m/js/.#metronome.js www/m/js/client.js www/m/js/metronome.js |
| diffstat | 10 files changed, 18 insertions(+), 52 deletions(-) [+] |
line wrap: on
line diff
--- a/INSTALL Wed Jul 04 13:10:04 2012 +0000 +++ b/INSTALL Wed Jul 04 21:24:36 2012 +0000 @@ -47,6 +47,5 @@ ////////////////////////////////// //start server - cd nodescore node nodescore.js
--- a/www/m/.#1.html Wed Jul 04 13:10:04 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -rob@tzara.26044:1340918990 \ No newline at end of file
--- a/www/m/1.html Wed Jul 04 13:10:04 2012 +0000 +++ b/www/m/1.html Wed Jul 04 21:24:36 2012 +0000 @@ -11,7 +11,10 @@ <script src="js/ini.js"></script> <script src="/socket.io/socket.io.js"></script> <script src="js/metronome.js"></script> + <script src="js/countin.js"></script> <script src="js/client.js"></script> + + </head> <body onload='document.getElementById("countinnumber").style.visibility="hidden";'>
--- a/www/m/2.html Wed Jul 04 13:10:04 2012 +0000 +++ b/www/m/2.html Wed Jul 04 21:24:36 2012 +0000 @@ -1,7 +1,7 @@ <!DOCTYPE html> <html> <head> - <link href="css/style-performer.css" rel="stylesheet"> + <link href="css/nodescore.css" rel="stylesheet"> <link href="css/slider.css" rel="stylesheet"> <link href="css/chat.css" rel="stylesheet"> <link href="css/metronome.css" rel="stylesheet">
--- a/www/m/3.html Wed Jul 04 13:10:04 2012 +0000 +++ b/www/m/3.html Wed Jul 04 21:24:36 2012 +0000 @@ -1,7 +1,7 @@ <!DOCTYPE html> <html> <head> - <link href="css/style-performer.css" rel="stylesheet"> + <link href="css/nodescore.css" rel="stylesheet"> <link href="css/slider.css" rel="stylesheet"> <link href="css/chat.css" rel="stylesheet"> <link href="css/metronome.css" rel="stylesheet">
--- a/www/m/4.html Wed Jul 04 13:10:04 2012 +0000 +++ b/www/m/4.html Wed Jul 04 21:24:36 2012 +0000 @@ -1,7 +1,7 @@ <!DOCTYPE html> <html> <head> - <link href="css/style-performer.css" rel="stylesheet"> + <link href="css/nodescore.css" rel="stylesheet"> <link href="css/slider.css" rel="stylesheet"> <link href="css/chat.css" rel="stylesheet"> <link href="css/metronome.css" rel="stylesheet">
--- a/www/m/controls.html Wed Jul 04 13:10:04 2012 +0000 +++ b/www/m/controls.html Wed Jul 04 21:24:36 2012 +0000 @@ -1,10 +1,9 @@ <!DOCTYPE html> <html> <head> - <link href="css/style-performer.css" rel="stylesheet"> + <link href="css/nodescore.css" rel="stylesheet"> <link href="css/metronome.css" rel="stylesheet"> - <script src="http://code.jquery.com/jquery-1.6.1.min.js"></script> - <script src="/jquery-uijs/jquery-ui-1.8.17.custom.min.js"></script> + <script src="js/jquery-1.7.1.min.js"></script> <script src="/socket.io/socket.io.js"></script> <script src="js/metronome.js"></script> <script src="js/client.js"></script>
--- a/www/m/js/.#metronome.js Wed Jul 04 13:10:04 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -rob@tzara.20578:1340918990 \ No newline at end of file
--- a/www/m/js/client.js Wed Jul 04 13:10:04 2012 +0000 +++ b/www/m/js/client.js Wed Jul 04 21:24:36 2012 +0000 @@ -3,22 +3,6 @@ var socket = io.connect(); -// receive metronome tick from server and execute -// css animation locally - -///////////////////////////////////////////////// - -socket.on("metroPulse", pulseInClient); -function pulseInClient(pulse,groupID,metrobeat){ - - var groupPage=document.getElementById('group').value -// console.log(pulse+"........"+ groupID+ "==" +groupPage+".........."+metrobeat) - if (groupID == groupPage) { -// var metrobeat=metrobeat -// console.log(pulse+" .................. "+metrobeat) - metronomeTick(1000, groupID, metrobeat); - } -} ///////////////////////////////////////////////// // update the stopwatch value on the client page in line with server @@ -42,31 +26,6 @@ function pad2(number) { return (number < 10 ? '0' : '') + number } ///////////////////////////////////////////////// -// countdown to change - -socket.on("countinFromServer", countinClient); -function countinClient(groupID, currentseconds,mm,text,colour,background){ - var groupPage=document.getElementById('group').value - if (groupID == groupPage) { - console.log(currentseconds); - document.getElementById("countinnumber").style.visibility="visible"; - document.getElementById("countinnumber").style.visibility="visible"; - //$("#countin").text(text); - $("#countinnumber").text(currentseconds); - $("#countinnumber").css('background-color', background); - - document.getElementById("countinnumber").style.color=colour; - - if ( currentseconds == 0) { - document.getElementById("countinnumber").style.visibility='hidden'; -// document.getElementById("countin").style.visibility='hidden'; - } - }} - -///////////////////////////////////////////////// - - -///////////////////////////////////////////////// socket.on("pageFlipfromserver", pageTurn); function pageTurn (group,unit,time,mm) {
--- a/www/m/js/metronome.js Wed Jul 04 13:10:04 2012 +0000 +++ b/www/m/js/metronome.js Wed Jul 04 21:24:36 2012 +0000 @@ -1,7 +1,15 @@ -//var socket = io.connect(); +var socket = io.connect(); //socket.on("metroPulse", metronomeTick); - +///////////////////////////////////////////////// +socket.on("metroPulse", pulseInClient); +function pulseInClient(pulse,groupID,metrobeat){ + var groupPage=document.getElementById('group').value + if (groupID == groupPage) { + metronomeTick(1000, groupID, metrobeat); + } +} +///////////////////////////////////////////////// function metroCss(beat, beatcolor,text){ var color = beatcolor;