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

update recording layout

Browse source
This commit is contained in:
Luke Pulverenti 2016-09-05 01:39:14 -04:00
parent 80948f62fa
commit 25dbf665dd
24 changed files with 341 additions and 256 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
define(['appStorage', 'events'], function (appStorage, events) {
define(['appStorage', 'events', 'browser'], function (appStorage, events, browser) {
var currentDisplayInfo;
var datetime;
@ -103,17 +103,22 @@
title: Globalize.translate('HeaderSelectPlayer'),
items: menuItems,
positionTo: button,
enableHistory: enableHistory !== false,
callback: function (id) {
var target = targets.filter(function (t) {
return t.id == id;
})[0];
// Unfortunately we can't allow the url to change or chromecast will throw a security error
// Might be able to solve this in the future by moving the dialogs to hashbangs
enableHistory: enableHistory !== false && !browser.chrome,
resolveOnClick: true
MediaController.trySetActivePlayer(target.playerName, target);
}).then(function (id) {
var target = targets.filter(function (t) {
return t.id == id;
})[0];
MediaController.trySetActivePlayer(target.playerName, target);
mirrorIfEnabled();
mirrorIfEnabled();
}
});
});
});
@ -313,6 +318,11 @@
console.log('Active player: ' + JSON.stringify(currentTargetInfo));
triggerPlayerChange(player, targetInfo, previousPlayer);
}, function () {
if (currentPairingId == targetInfo.id) {
currentPairingId = null;
}
});
};