From 8e4eb803d767eed1f6a5e9cbd6bad92cdf7d3974 Mon Sep 17 00:00:00 2001 From: didier amyot Date: Sun, 20 May 2018 17:12:57 -0400 Subject: [PATCH] more resilient team structure --- script/teams.js | 4 ++-- script/views/playersPage.js | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/script/teams.js b/script/teams.js index 325bbac..3a53101 100644 --- a/script/teams.js +++ b/script/teams.js @@ -3,12 +3,12 @@ define(['m', '_'], function (m, _) { teams.teams = function(){ return [ + {name: 'remplaçants', color: '#FFA500'}, {name: 'jaune', color: '#FF0'}, {name:'rouge', color: '#F00'}, {name:'bleu', color: '#00F'}, {name:'gris', color: '#808080'}, - {name:'vert', color: '#008000'}, - {name: 'remplaçants', color: '#FFA500'} + {name:'vert', color: '#008000'} ]; }; diff --git a/script/views/playersPage.js b/script/views/playersPage.js index 1dce451..d69695a 100644 --- a/script/views/playersPage.js +++ b/script/views/playersPage.js @@ -268,6 +268,7 @@ define(['m', '_', 'spritz', 'teams'], function (m, _ , spritz, teams) { playersTable.tableBody = function(players, visibleTeams, activatedScores, searchTerm){ return m('tbody', _(players) + .filter(_.isObject) .filter(playersTable.onlyPlayerOfTeams(visibleTeams)) .filter(playersTable.onlyPlayerOfScore(activatedScores)) .filter(playersTable.playerHasBeenSearchedFor(searchTerm))