Mercurial > hg > nodescore
comparison www/m/js/nodescore-slides.js @ 58:474c1ad1e811
big fix to seq logic and control css
author | tzara <rc-web@kiben.net> |
---|---|
date | Sun, 31 Mar 2013 01:46:39 +0000 |
parents | 66bf613fb818 |
children | 5ba250832739 |
comparison
equal
deleted
inserted
replaced
57:a47aa7866ed8 | 58:474c1ad1e811 |
---|---|
53 | 53 |
54 ///////////////////////////////////////////////// | 54 ///////////////////////////////////////////////// |
55 // countdown to change | 55 // countdown to change |
56 | 56 |
57 socket.on("countinFromServer", countinClient); | 57 socket.on("countinFromServer", countinClient); |
58 function countinClient(groupID, currentseconds,mm,text,colour,background){ | 58 function countinClient(groupID, currentseconds,mm,text,colour,background,unit){ |
59 var groupPage=document.getElementById('group').value | 59 var groupPage=document.getElementById('group').value |
60 if (groupID == groupPage) { | 60 // if (groupID == groupPage) { |
61 document.getElementById("count").style.visibility="visible"; | 61 //document.getElementById("count"+groupID).style.visibility="visible"; |
62 document.getElementById("count").style.visibility="visible"; | 62 //document.getElementById("count"+groupID).style.visibility="visible"; |
63 $("#counttitle").text(text); | 63 $("#counttitle").text(text); |
64 $("#count").text(currentseconds); | 64 // in box |
65 //$("#cnt").text(currentseconds); | 65 //$('#sqr'+unit).text(currentseconds); |
66 $("#count").css('background-color', background); | 66 //console.log('#sqr'+unit) |
67 document.getElementById("count").style.color=colour; | 67 $("#count"+groupID).text(currentseconds); |
68 // if ( currentseconds == 0) { | 68 //$("#cnt").text(currentseconds); |
69 //document.getElementById("midcomms").style.visibility='hidden'; | 69 |
70 $("#count"+groupID).css('background-color', background); | |
71 // document.getElementById("count"+groupID).style.color=colour; | |
72 // if ( currentseconds == 0) { | |
73 //document.getElementById("midcomms").style.visibility='hidden'; | |
70 // } | 74 // } |
71 }} | 75 }//} |
72 ///////////////////////////////////////////////// | 76 ///////////////////////////////////////////////// |
73 | 77 |
74 ///////////////////////////////////////////////// | 78 ///////////////////////////////////////////////// |
75 // countdown to change | 79 // countdown to change |
76 | 80 |
77 socket.on("counterText", cText); | 81 socket.on("counterText", cText); |
78 function cText(groupID, currentseconds,text){ | 82 function cText(groupID, currentseconds,text){ |
83 $("#totalcountdown"+groupID).text(text); | |
79 var groupPage=document.getElementById('group').value | 84 var groupPage=document.getElementById('group').value |
80 if (groupID == groupPage) { | 85 if (groupID == groupPage) { |
81 //console.log(text) | 86 //console.log(text) |
82 $("#totalcountdown").text(text); | 87 $("#totalcountdown").text(text); |
83 }} | 88 }} |
104 // pageFlip(unit); | 109 // pageFlip(unit); |
105 pageTurnB(unit) | 110 pageTurnB(unit) |
106 | 111 |
107 } | 112 } |
108 else { | 113 else { |
109 console.log("not for this group... ignoring... for group:" + group ); | 114 //console.log("not for this group... ignoring... for group:" + group ); |
110 } | 115 } |
111 } | 116 } |
112 | 117 |
113 function pageTurnB(unit) { | 118 function pageTurnB(unit) { |
114 var units=6; | 119 var units=6; |