Fixes list of displayed players

quentinms · Feb 15, 2016 · 110ac7f · 110ac7f
1 parent 50d1d57
commit 110ac7f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/app/index.html b/app/index.html
@@ -67,7 +67,7 @@ <h3 class="center-text">{{timeRemaining}} remaining</h3>
 					</div>
 					<div class="center-text">
 						<ul class="player-list">
-							<li ng-repeat="player in selectedGame.Players | filter: filterPlayers | orderBy:'TurnOrder'" class="player-item">
+							<li ng-repeat="player in selectedGame.Players | filter: filterPlayers(selectedGame) | orderBy:'TurnOrder'" class="player-item">
 								<img class="medium img-circle media-object" ng-src="{{players[player.UserId].AvatarUrl}}">
 							</li>
 						</ul>

diff --git a/app/js/index.js b/app/js/index.js
@@ -93,13 +93,17 @@ app.controller('GlobalController', function ($scope, $timeout) {
     return showError(err)
   })
 
+  $scope.filterPlayers = function filterPlayers (game) {
+    return function (player) {
+      return player.UserId !== '0' && player.UserId !== game.CurrentTurn.UserId
+    }
+  }
+
 })
 
 app.controller('GameInfoController', function ($scope, $timeout) {
   $scope.timeRemaining = '9000 years'
 
-  $scope.filterPlayers = filterPlayers($scope.selectedGame)
-
   $scope.$on('selectedGameWasUpdated', () => {
     const timeRemaining = moment($scope.selectedGame.CurrentTurn.Expires).fromNow(true)
     if (!timeRemaining) {
@@ -135,9 +139,7 @@ app.controller('GameInfoController', function ($scope, $timeout) {
 
 })
 
-app.controller('GameListController', function ($scope) {
-  return $scope.filterPlayers = filterPlayers
-})
+app.controller('GameListController', function ($scope) {})
 
 app.controller('SettingsController', function ($scope) {
   $scope.settings = gmr.getSettings()
@@ -166,9 +168,3 @@ app.controller('SettingsController', function ($scope) {
     $scope.settings = gmr.getSettings()
   }
 })
-
-function filterPlayers (game) {
-  return function (player) {
-    return player.UserId !== '0' && player.UserId !== game.CurrentTurn.UserId
-  }
-}