From: Benjamin Auder Date: Wed, 3 Jun 2020 21:08:16 +0000 (+0200) Subject: Merge branch 'simu' X-Git-Url: https://git.auder.net/?a=commitdiff_plain;h=8e346ebebfdaec1538f9728fa7a279027c990f78;hp=63d6223e8aa9d8c66238c697c06d5f4806aedcf2;p=vchess.git Merge branch 'simu' --- diff --git a/client/src/views/Game.vue b/client/src/views/Game.vue index cd781a5d..fa7ab3b2 100644 --- a/client/src/views/Game.vue +++ b/client/src/views/Game.vue @@ -522,7 +522,11 @@ export default { }, getGameType: function(game) { if (!!game.id.toString().match(/^i/)) return "import"; - return game.cadence.indexOf("d") >= 0 ? "corr" : "live"; + return ( + game.cadence.indexOf("d") >= 0 + ? "corr" + : (game.cadence.indexOf("/") >= 0 ? "simul" : "live") + ); }, // Notify something after a new move (to opponent and me on MyGames page) notifyMyGames: function(thing, data) { diff --git a/client/src/views/Hall.vue b/client/src/views/Hall.vue index 4e1e54b8..4be708d2 100644 --- a/client/src/views/Hall.vue +++ b/client/src/views/Hall.vue @@ -562,9 +562,12 @@ export default { }, // o: challenge or game classifyObject: function(o) { - // Consider imports as live games (TODO) - if (!!o.id && !!o.id.toString().match(/^i/)) return "live"; - return o.cadence.indexOf("d") === -1 ? "live" : "corr"; + // No imported games here + return ( + o.cadence.indexOf("d") >= 0 + ? "corr" + : (o.cadence.indexOf("/") >= 0 ? "simul" : "live") + ); }, setDisplay: function(letter, type, e) { this[letter + "display"] = type;