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

use shared playerselection

Browse source
This commit is contained in:
Luke Pulverenti 2017-01-19 01:21:03 -05:00
parent db9eb799d9
commit bd5d600bd8
7 changed files with 44 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-webcomponents/.bower.json vendored
View file

@ -14,12 +14,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.4.476", "version": "1.4.477",
"_release": "1.4.476", "_release": "1.4.477",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.4.476", "tag": "1.4.477",
"commit": "802991db23eeaba201548ad9987282a2cab2671a" "commit": "15c8b92f1398ccfe25f1d820994c162453f529cf"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1", "_target": "^1.2.1",

4
dashboard-ui/bower_components/emby-webcomponents/playback/playbackmanager.js vendored
View file

@ -845,10 +845,6 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
var val = enabled ? '1' : '0'; var val = enabled ? '1' : '0';
appSettings.set('displaymirror', val); appSettings.set('displaymirror', val);
if (enabled) {
mirrorIfEnabled();
}
return; return;
} }

47
dashboard-ui/components/playerselection.js → dashboard-ui/bower_components/emby-webcomponents/playback/playerselection.js vendored
View file

@ -1,4 +1,4 @@
define(['appSettings', 'events', 'browser', 'libraryMenu', 'loading', 'playbackManager'], function (appSettings, events, browser, libraryMenu, loading, playbackManager) { define(['appSettings', 'events', 'browser', 'libraryMenu', 'loading', 'playbackManager', 'embyRouter', 'globalize'], function (appSettings, events, browser, libraryMenu, loading, playbackManager, embyRouter, globalize) {
'use strict'; 'use strict';
var currentDisplayInfo; var currentDisplayInfo;
@ -25,7 +25,7 @@
var player = playbackManager.getPlayerInfo(); var player = playbackManager.getPlayerInfo();
if (player) { if (player) {
if (!player.isLocalPlayer && player.supportedCommands.indexOf('DisplayContent') != -1) { if (!player.isLocalPlayer && player.supportedCommands.indexOf('DisplayContent') !== -1) {
mirrorItem(info, player); mirrorItem(info, player);
} }
} }
@ -53,7 +53,7 @@
var name = t.name; var name = t.name;
if (t.appName && t.appName != t.name) { if (t.appName && t.appName !== t.name) {
name += " - " + t.appName; name += " - " + t.appName;
} }
@ -70,12 +70,11 @@
loading.hide(); loading.hide();
var menuOptions = { var menuOptions = {
title: Globalize.translate('HeaderSelectPlayer'), title: globalize.translate('sharedcomponents#HeaderSelectPlayer'),
items: menuItems, items: menuItems,
positionTo: button, positionTo: button,
resolveOnClick: true resolveOnClick: true
}; };
// Unfortunately we can't allow the url to change or chromecast will throw a security error // Unfortunately we can't allow the url to change or chromecast will throw a security error
@ -87,7 +86,7 @@
actionsheet.show(menuOptions).then(function (id) { actionsheet.show(menuOptions).then(function (id) {
var target = targets.filter(function (t) { var target = targets.filter(function (t) {
return t.id == id; return t.id === id;
})[0]; })[0];
playbackManager.trySetActivePlayer(target.playerName, target); playbackManager.trySetActivePlayer(target.playerName, target);
@ -130,12 +129,12 @@
html += '<div>'; html += '<div>';
if (playerInfo.supportedCommands.indexOf('DisplayContent') != -1) { if (playerInfo.supportedCommands.indexOf('DisplayContent') !== -1) {
html += '<label class="checkboxContainer">'; html += '<label class="checkboxContainer">';
var checkedHtml = playbackManager.enableDisplayMirroring() ? ' checked' : ''; var checkedHtml = playbackManager.enableDisplayMirroring() ? ' checked' : '';
html += '<input type="checkbox" is="emby-checkbox" class="chkMirror"' + checkedHtml + '/>'; html += '<input type="checkbox" is="emby-checkbox" class="chkMirror"' + checkedHtml + '/>';
html += '<span>' + Globalize.translate('OptionEnableDisplayMirroring') + '</span>'; html += '<span>' + globalize.translate('sharedcomponents#EnableDisplayMirroring') + '</span>';
html += '</label>'; html += '</label>';
} }
@ -143,9 +142,9 @@
html += '<div style="margin-top:1em;display:flex;justify-content: flex-end;">'; html += '<div style="margin-top:1em;display:flex;justify-content: flex-end;">';
html += '<button is="emby-button" type="button" class="button-flat button-accent-flat btnRemoteControl promptDialogButton">' + Globalize.translate('ButtonRemoteControl') + '</button>'; html += '<button is="emby-button" type="button" class="button-flat button-accent-flat btnRemoteControl promptDialogButton">' + globalize.translate('sharedcomponents#HeaderRemoteControl') + '</button>';
html += '<button is="emby-button" type="button" class="button-flat button-accent-flat btnDisconnect promptDialogButton ">' + Globalize.translate('ButtonDisconnect') + '</button>'; html += '<button is="emby-button" type="button" class="button-flat button-accent-flat btnDisconnect promptDialogButton ">' + globalize.translate('sharedcomponents#Disconnect') + '</button>';
html += '<button is="emby-button" type="button" class="button-flat button-accent-flat btnCancel promptDialogButton">' + Globalize.translate('ButtonCancel') + '</button>'; html += '<button is="emby-button" type="button" class="button-flat button-accent-flat btnCancel promptDialogButton">' + globalize.translate('sharedcomponents#ButtonCancel') + '</button>';
html += '</div>'; html += '</div>';
html += '</div>'; html += '</div>';
@ -178,7 +177,7 @@
dialogHelper.open(dlg).then(function () { dialogHelper.open(dlg).then(function () {
if (destination) { if (destination) {
Dashboard.navigate(destination); embyRouter.show(destination);
} }
}); });
} }
@ -204,17 +203,27 @@
document.addEventListener('headercreated', bindCastButton); document.addEventListener('headercreated', bindCastButton);
bindCastButton(); bindCastButton();
pageClassOn('pagebeforeshow', "page", function () { document.addEventListener('viewbeforeshow', function () {
var page = this;
currentDisplayInfo = null; currentDisplayInfo = null;
}); });
pageClassOn('displayingitem', "libraryPage", function (e) { document.addEventListener('viewshow', function (e) {
var info = e.detail; var state = e.detail.state || {};
mirrorIfEnabled(info); var item = state.item;
if (item && item.ServerId) {
mirrorIfEnabled({
item: item
});
return;
}
});
events.on(appSettings, 'change', function (e, name) {
if (name === 'displaymirror') {
mirrorIfEnabled();
}
}); });
return { return {

6
dashboard-ui/bower_components/emby-webcomponents/strings/da.json vendored
View file

@ -115,7 +115,7 @@
"RefreshDialogHelp": "Metadata opdateres alt efter hvilke indstillinger og internet-servicer der er aktiveret i Emby Server-kontrolpanelet.", "RefreshDialogHelp": "Metadata opdateres alt efter hvilke indstillinger og internet-servicer der er aktiveret i Emby Server-kontrolpanelet.",
"Open": "\u00c5ben", "Open": "\u00c5ben",
"Play": "Afspil", "Play": "Afspil",
"AddToPlayQueue": "Add to play queue", "AddToPlayQueue": "Tilf\u00f8j til afspilningsk\u00f8",
"Shuffle": "Bland", "Shuffle": "Bland",
"Identify": "Identificer", "Identify": "Identificer",
"EditImages": "Rediger billeder", "EditImages": "Rediger billeder",
@ -378,6 +378,6 @@
"SyncJobItemStatusCancelled": "Annulleret", "SyncJobItemStatusCancelled": "Annulleret",
"Retry": "Pr\u00f8v igen", "Retry": "Pr\u00f8v igen",
"HeaderMyDevice": "Min Enhed", "HeaderMyDevice": "Min Enhed",
"Continue": "Continue", "Continue": "Forts\u00e6t",
"ContinueInSecondsValue": "Continue in {0} seconds." "ContinueInSecondsValue": "Forts\u00e6t om {0} sekunder."
} }

6
dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json vendored
View file

@ -379,5 +379,9 @@
"Retry": "Retry", "Retry": "Retry",
"HeaderMyDevice": "My Device", "HeaderMyDevice": "My Device",
"Continue": "Continue", "Continue": "Continue",
"ContinueInSecondsValue": "Continue in {0} seconds." "ContinueInSecondsValue": "Continue in {0} seconds.",
"HeaderRemoteControl": "Remote Control",
"Disconnect": "Disconnect",
"EnableDisplayMirroring": "Enable display mirroring",
"HeaderSelectPlayer": "Select Player"
} }

6
dashboard-ui/bower_components/emby-webcomponents/strings/es-MX.json vendored
View file

@ -115,7 +115,7 @@
"RefreshDialogHelp": "Los metadatos son actualizados bas\u00e1ndose en las configuraciones y servicios de internet que que est\u00e9n activados en el panel de control de su Servidor de Emby.", "RefreshDialogHelp": "Los metadatos son actualizados bas\u00e1ndose en las configuraciones y servicios de internet que que est\u00e9n activados en el panel de control de su Servidor de Emby.",
"Open": "Abrir", "Open": "Abrir",
"Play": "Reproducir", "Play": "Reproducir",
"AddToPlayQueue": "Add to play queue", "AddToPlayQueue": "Agregar a la cola de reproduccion",
"Shuffle": "Aleatorio", "Shuffle": "Aleatorio",
"Identify": "Identificar", "Identify": "Identificar",
"EditImages": "Editar im\u00e1genes", "EditImages": "Editar im\u00e1genes",
@ -378,6 +378,6 @@
"SyncJobItemStatusCancelled": "Cancelado", "SyncJobItemStatusCancelled": "Cancelado",
"Retry": "Volver a intentar", "Retry": "Volver a intentar",
"HeaderMyDevice": "Mi Dispositivo", "HeaderMyDevice": "Mi Dispositivo",
"Continue": "Continue", "Continue": "Continuar",
"ContinueInSecondsValue": "Continue in {0} seconds." "ContinueInSecondsValue": "Continua en {0} segundos."
} }

2
dashboard-ui/scripts/site.js
View file

@ -1029,7 +1029,7 @@ var AppInfo = {};
define("directorybrowser", ["components/directorybrowser/directorybrowser"], returnFirstDependency); define("directorybrowser", ["components/directorybrowser/directorybrowser"], returnFirstDependency);
define("metadataEditor", [embyWebComponentsBowerPath + "/metadataeditor/metadataeditor"], returnFirstDependency); define("metadataEditor", [embyWebComponentsBowerPath + "/metadataeditor/metadataeditor"], returnFirstDependency);
define("personEditor", [embyWebComponentsBowerPath + "/metadataeditor/personeditor"], returnFirstDependency); define("personEditor", [embyWebComponentsBowerPath + "/metadataeditor/personeditor"], returnFirstDependency);
define("playerSelectionMenu", ["components/playerselection"], returnFirstDependency); define("playerSelectionMenu", [embyWebComponentsBowerPath + "/playback/playerselection"], returnFirstDependency);
define("libraryMenu", ["scripts/librarymenu"], returnFirstDependency); define("libraryMenu", ["scripts/librarymenu"], returnFirstDependency);