mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

fixes #898 - Google Cast Ready

Browse source
This commit is contained in:
Luke Pulverenti 2015-12-25 23:08:25 -05:00
parent 9af2992260
commit 2a800129cb
4 changed files with 106 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
dashboard-ui/scripts/mediacontroller.js
View file

@ -286,9 +286,9 @@
};
};
function triggerPlayerChange(newPlayer, newTarget) {
function triggerPlayerChange(newPlayer, newTarget, previousPlayer) {
Events.trigger(self, 'playerchange', [newPlayer, newTarget]);
Events.trigger(self, 'playerchange', [newPlayer, newTarget, previousPlayer]);
}
self.setActivePlayer = function (player, targetInfo) {
@ -303,13 +303,15 @@
throw new Error('null player');
}
var previousPlayer = currentPlayer;
currentPairingId = null;
currentPlayer = player;
currentTargetInfo = targetInfo;
console.log('Active player: ' + JSON.stringify(currentTargetInfo));
triggerPlayerChange(player, targetInfo);
triggerPlayerChange(player, targetInfo, previousPlayer);
};
var currentPairingId = null;
@ -333,12 +335,14 @@
player.tryPair(targetInfo).then(function () {
var previousPlayer = currentPlayer;
currentPlayer = player;
currentTargetInfo = targetInfo;
console.log('Active player: ' + JSON.stringify(currentTargetInfo));
triggerPlayerChange(player, targetInfo);
triggerPlayerChange(player, targetInfo, previousPlayer);
});
};