Merge hotfix-1.1.1 branch

This commit is contained in:
Ben Ramey
2014-06-22 15:42:25 -05:00

View File

@@ -28,7 +28,7 @@ lunchControllers.controller 'RunCtrl', ['$scope', 'socket', '$routeParams', '$sc
socket.on 'message', (m) ->
if m.verb is 'update' and m.data.run_id is $routeParams.id
invitee = _.findWhere $scope.invitees, run_id: m.data.run_id
invitee = _.findWhere $scope.invitees, id: m.data.id
_.extend invitee, m.data
$scope.setProgress()
$scope.setStatusClasses()