X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FMyGames.vue;h=c9c34f348b68f25de69a3a97b88d3d2092b20577;hb=6b7b2cf720e6255e4da0dc34fee363c456346a58;hp=88b690659d9aa47752072979313cb5af687893e2;hpb=e727fe31742dfb3e40eb222c94f4199e2be98453;p=vchess.git diff --git a/client/src/views/MyGames.vue b/client/src/views/MyGames.vue index 88b69065..c9c34f34 100644 --- a/client/src/views/MyGames.vue +++ b/client/src/views/MyGames.vue @@ -45,7 +45,7 @@ export default { }; }, created: function() { - GameStorage.getAll(true, localGames => { + GameStorage.getAll(localGames => { localGames.forEach(g => g.type = "live"); this.decorate(localGames); this.liveGames = localGames; @@ -114,22 +114,19 @@ export default { .classList.add("somethingnew"); } }, - // Called at loading to augment games with priority + myTurn infos + // Called at loading to augment games with myColor + myTurn infos decorate: function(games) { games.forEach(g => { - g.priority = 0; + g.myColor = + (g.type == "corr" && g.players[0].uid == this.st.user.id) || + (g.type == "live" && g.players[0].sid == this.st.user.sid) + ? 'w' + : 'b'; + // If game is over, myTurn doesn't exist: if (g.score == "*") { - g.priority++; - const myColor = - (g.type == "corr" && g.players[0].uid == this.st.user.id) || - (g.type == "live" && g.players[0].sid == this.st.user.sid) - ? 'w' - : 'b'; const rem = g.movesCount % 2; - if ((rem == 0 && myColor == 'w') || (rem == 1 && myColor == 'b')) { + if ((rem == 0 && g.myColor == 'w') || (rem == 1 && g.myColor == 'b')) g.myTurn = true; - g.priority++; - } } }); }, @@ -148,11 +145,7 @@ export default { // "notifything" --> "thing": const thing = data.code.substr(6); game[thing] = info[thing]; - if (thing == "score") game.priority = 0; - else { - game.priority = 3 - game.priority; //toggle turn - game.myTurn = !game.myTurn; - } + if (thing == "turn") game.myTurn = !game.myTurn; this.$forceUpdate(); this.tryShowNewsIndicator(type); break; @@ -173,15 +166,9 @@ export default { }, gameInfo ); - // Compute priority: - game.priority = 1; //at least: my running game - if ( + game.myTurn = (type == "corr" && game.players[0].uid == this.st.user.id) || - (type == "live" && game.players[0].sid == this.st.user.sid) - ) { - game.priority++; - game.myTurn = true; - } + (type == "live" && game.players[0].sid == this.st.user.sid); gamesArrays[type].push(game); this.$forceUpdate(); this.tryShowNewsIndicator(type);