Skip to content

Commit 110ac7f

Browse files
committed
Fixes list of displayed players
1 parent 50d1d57 commit 110ac7f

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

app/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ <h3 class="center-text">{{timeRemaining}} remaining</h3>
6767
</div>
6868
<div class="center-text">
6969
<ul class="player-list">
70-
<li ng-repeat="player in selectedGame.Players | filter: filterPlayers | orderBy:'TurnOrder'" class="player-item">
70+
<li ng-repeat="player in selectedGame.Players | filter: filterPlayers(selectedGame) | orderBy:'TurnOrder'" class="player-item">
7171
<img class="medium img-circle media-object" ng-src="{{players[player.UserId].AvatarUrl}}">
7272
</li>
7373
</ul>

app/js/index.js

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,17 @@ app.controller('GlobalController', function ($scope, $timeout) {
9393
return showError(err)
9494
})
9595

96+
$scope.filterPlayers = function filterPlayers (game) {
97+
return function (player) {
98+
return player.UserId !== '0' && player.UserId !== game.CurrentTurn.UserId
99+
}
100+
}
101+
96102
})
97103

98104
app.controller('GameInfoController', function ($scope, $timeout) {
99105
$scope.timeRemaining = '9000 years'
100106

101-
$scope.filterPlayers = filterPlayers($scope.selectedGame)
102-
103107
$scope.$on('selectedGameWasUpdated', () => {
104108
const timeRemaining = moment($scope.selectedGame.CurrentTurn.Expires).fromNow(true)
105109
if (!timeRemaining) {
@@ -135,9 +139,7 @@ app.controller('GameInfoController', function ($scope, $timeout) {
135139

136140
})
137141

138-
app.controller('GameListController', function ($scope) {
139-
return $scope.filterPlayers = filterPlayers
140-
})
142+
app.controller('GameListController', function ($scope) {})
141143

142144
app.controller('SettingsController', function ($scope) {
143145
$scope.settings = gmr.getSettings()
@@ -166,9 +168,3 @@ app.controller('SettingsController', function ($scope) {
166168
$scope.settings = gmr.getSettings()
167169
}
168170
})
169-
170-
function filterPlayers (game) {
171-
return function (player) {
172-
return player.UserId !== '0' && player.UserId !== game.CurrentTurn.UserId
173-
}
174-
}

0 commit comments

Comments
 (0)