summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2013-03-05 03:30:21 -0500
committerJules Laplace <jules@okfoc.us>2013-03-05 03:30:21 -0500
commit44f85b846574bdf7f7e21a3e925889548221c17c (patch)
tree2365bdafe5e0d47f8da1eb67c125edfd3c388f85
parent890bc8ded144a0555d3c947ef377295bcdbdc724 (diff)
+=
-rw-r--r--public/js/draw.js1
-rw-r--r--public/js/game.js3
-rw-r--r--server.js4
3 files changed, 5 insertions, 3 deletions
diff --git a/public/js/draw.js b/public/js/draw.js
index b969c1e..9116f78 100644
--- a/public/js/draw.js
+++ b/public/js/draw.js
@@ -50,6 +50,7 @@ $(function(){
console.log("saved");
});
clearWorkspace();
+ $("#drawing").hide();
});
function draw(start, end){
diff --git a/public/js/game.js b/public/js/game.js
index 0b90328..598e3c6 100644
--- a/public/js/game.js
+++ b/public/js/game.js
@@ -162,7 +162,8 @@ UI[ State.WINNING ] = new function(){
for (var i in data.scores) {
scores.push( [data.scores[i], i] );
}
- var topthree = scores.sort(function(){ a[0] - b[0] }).splice(0, 3);
+ var topthree = scores.sort(function(a,b){ a[0] - b[0] }).splice(0, 3);
+ console.log(data);
for (var i in topthree) {
var score = topthree[i][0]
var nick = topthree[i][1]
diff --git a/server.js b/server.js
index 68bdd62..9d26aa8 100644
--- a/server.js
+++ b/server.js
@@ -154,10 +154,10 @@ Channel.prototype.pushImage = function(image){
}
Channel.prototype.addVote = function(data, user){
- if (data.nick in this.images && not( user.nick in this.votes )) {
+ if (data.nick in this.images && !( user.nick in this.votes )) {
this.voteCount++;
this.votes[ user.nick ] = true;
- this.scores[ data.nick ] += 1;
+ this.scores[ data.nick ] = this.scores[ data.nick ] ? this.scores[ data.nick ] + 1 : 1;
if (this.voteCount == this.playerCount) this.startWinning();
}
}