Merge branch 'master' of github.com:novemberborn/linkedgov-hackcamp

novemberborn · Apr 10, 2011 · e3339cc · e3339cc
2 parents 53f0aff + 9a844d6
commit e3339cc
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/public/index.html b/public/index.html
@@ -52,7 +52,7 @@ <h2></h2>
       </div>
 
       <div id="count-down">
-        <p class="timer">{10}</p>
+        <p class="timer"></p>
       </div>
     </header>
 

diff --git a/public/js/enhancement.js b/public/js/enhancement.js
@@ -76,6 +76,23 @@ function updateCash(points){
   $("#player-details .cash").text("£ " + points).addClass(points < 0 ? "bankrupt" : "");
 }
 
+function countdown(){
+  clearInterval(countdown.interval);
+  var timer = $("#count-down .timer");
+  var remaining = 10;
+  timer.text(10);
+  countdown.interval = setInterval(function(){
+    remaining--;
+    if(remaining >= 0){
+      timer.text(remaining);
+    }
+    if(remaining <= 0){
+      clearInterval(countdown.interval);
+      socket.send({ type: "move", country: "pass" });
+    }
+  }, 1000);
+}
+
 Commands["register-user"] = {
   exec: function(data){
     if(data.single){
@@ -86,8 +103,8 @@ Commands["register-user"] = {
 
 Commands["move"] = {
   exec: function(data){
-    console.log(data);
     updateCash(data.points);
+    countdown();
     $("#current-item h2").text(data.commodity.title);
     $("#current-item p").text("£ " + data.commodity.points);
     $("#country-list li").each(function(ix, li){