mirrors
/
PretendYoureXyzzy
mirror of https://github.com/ajanata/PretendYoureXyzzy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #79 from uecasm/keep-cards-join 

Keep playfield intact when players join/leave.
This commit is contained in:
Andy Janata 2014-01-25 07:52:48 -08:00
parent bcaeae6f18 8bca23ed9d
commit 13be0fdbbb
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
WebContent/js/cah.game.js
View File

@ -784,12 +784,6 @@ cah.Game.prototype.updateGameStatus = function(data) {
this.hideOptions_();
}
if (gameInfo[cah.$.GameInfo.STATE] == cah.$.GameState.PLAYING) {
// TODO this is the cause of the cards blanking when someone joins or leaves
// store the last state somewhere too?
$(".game_white_cards", this.element_).empty();
}
$(".score_limit", this.optionsElement_).val(gameInfo[cah.$.GameInfo.SCORE_LIMIT]);
$(".player_limit", this.optionsElement_).val(gameInfo[cah.$.GameInfo.PLAYER_LIMIT]);
$(".spectator_limit", this.optionsElement_).val(gameInfo[cah.$.GameInfo.SPECTATOR_LIMIT]);
@ -1328,6 +1322,7 @@ cah.Game.prototype.stateChange = function(data) {
break;
case cah.$.GameState.PLAYING:
$(".game_white_cards", this.element_).empty();
this.enableCardControls_();
this.hideOptions_();
this.refreshGameStatus();