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

multiple import fixes between other minor bugs

This commit is contained in:
vitorsemeano 2020-11-08 20:14:55 +00:00
parent f77165f8c0
commit 4dd1917949
4 changed files with 77 additions and 86 deletions

View file

@ -15,6 +15,7 @@ import appFooter from '../appFooter/appFooter';
import itemShortcuts from '../shortcuts'; import itemShortcuts from '../shortcuts';
import './nowPlayingBar.css'; import './nowPlayingBar.css';
import '../../elements/emby-slider/emby-slider'; import '../../elements/emby-slider/emby-slider';
import { appRouter } from '../appRouter';
/* eslint-disable indent */ /* eslint-disable indent */
@ -248,9 +249,7 @@ import '../../elements/emby-slider/emby-slider';
} }
function showRemoteControl() { function showRemoteControl() {
import('../appRouter').then(({default: appRouter}) => { appRouter.showNowPlaying();
appRouter.showNowPlaying();
});
} }
let nowPlayingBarElement; let nowPlayingBarElement;

View file

@ -7,6 +7,10 @@ import { appRouter } from '../appRouter';
import globalize from '../../scripts/globalize'; import globalize from '../../scripts/globalize';
import { appHost } from '../apphost'; import { appHost } from '../apphost';
import { enable, isEnabled, supported } from '../../scripts/autocast'; import { enable, isEnabled, supported } from '../../scripts/autocast';
import '../../elements/emby-checkbox/emby-checkbox';
import '../../elements/emby-button/emby-button';
import dialog from '../dialog/dialog';
import dialogHelper from '../dialogHelper/dialogHelper';
function mirrorItem(info, player) { function mirrorItem(info, player) {
const item = info.item; const item = info.item;
@ -140,47 +144,38 @@ export function show(button) {
} }
function showActivePlayerMenu(playerInfo) { function showActivePlayerMenu(playerInfo) {
Promise.all([ showActivePlayerMenuInternal(dialogHelper, playerInfo);
import('../dialogHelper/dialogHelper'),
import('../dialog/dialog'),
import('../../elements/emby-checkbox/emby-checkbox'),
import('../../elements/emby-button/emby-button')
]).then(([dialogHelper]) => {
showActivePlayerMenuInternal(dialogHelper, playerInfo);
});
} }
function disconnectFromPlayer(currentDeviceName) { function disconnectFromPlayer(currentDeviceName) {
if (playbackManager.getSupportedCommands().indexOf('EndSession') !== -1) { if (playbackManager.getSupportedCommands().indexOf('EndSession') !== -1) {
import('../dialog/dialog').then(({default: dialog}) => { const menuItems = [];
const menuItems = [];
menuItems.push({ menuItems.push({
name: globalize.translate('Yes'), name: globalize.translate('Yes'),
id: 'yes' id: 'yes'
}); });
menuItems.push({ menuItems.push({
name: globalize.translate('No'), name: globalize.translate('No'),
id: 'no' id: 'no'
}); });
dialog({ dialog.show({
buttons: menuItems, buttons: menuItems,
text: globalize.translate('ConfirmEndPlayerSession', currentDeviceName) text: globalize.translate('ConfirmEndPlayerSession', currentDeviceName)
}).then(function (id) { }).then(function (id) {
switch (id) { switch (id) {
case 'yes': case 'yes':
playbackManager.getCurrentPlayer().endSession(); playbackManager.getCurrentPlayer().endSession();
playbackManager.setDefaultPlayerActive(); playbackManager.setDefaultPlayerActive();
break; break;
case 'no': case 'no':
playbackManager.setDefaultPlayerActive(); playbackManager.setDefaultPlayerActive();
break; break;
default: default:
break; break;
} }
});
}); });
} else { } else {
playbackManager.setDefaultPlayerActive(); playbackManager.setDefaultPlayerActive();

View file

@ -42,7 +42,7 @@ import globalize from '../scripts/globalize';
return Promise.resolve(plugin); return Promise.resolve(plugin);
} else { } else {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
PluginManager.loadStrings(plugin) this.#loadStrings(plugin)
.then(function () { .then(function () {
resolve(plugin); resolve(plugin);
}) })

View file

@ -3,6 +3,7 @@ import loading from '../loading/loading';
import ServerConnections from '../ServerConnections'; import ServerConnections from '../ServerConnections';
import toast from '../toast/toast'; import toast from '../toast/toast';
import confirm from '../confirm/confirm'; import confirm from '../confirm/confirm';
import dialog from '../dialog/dialog';
/*eslint prefer-const: "error"*/ /*eslint prefer-const: "error"*/
@ -100,60 +101,56 @@ function sendToast(msg) {
function showMultiCancellationPrompt(serverId, programId, timerId, timerStatus, seriesTimerId) { function showMultiCancellationPrompt(serverId, programId, timerId, timerStatus, seriesTimerId) {
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
import('../dialog/dialog').then((dialog) => { const items = [];
const items = [];
items.push({
name: globalize.translate('HeaderKeepRecording'),
id: 'cancel',
type: 'submit'
});
if (timerStatus === 'InProgress') {
items.push({ items.push({
name: globalize.translate('HeaderKeepRecording'), name: globalize.translate('HeaderStopRecording'),
id: 'cancel', id: 'canceltimer',
type: 'submit'
});
if (timerStatus === 'InProgress') {
items.push({
name: globalize.translate('HeaderStopRecording'),
id: 'canceltimer',
type: 'cancel'
});
} else {
items.push({
name: globalize.translate('HeaderCancelRecording'),
id: 'canceltimer',
type: 'cancel'
});
}
items.push({
name: globalize.translate('HeaderCancelSeries'),
id: 'cancelseriestimer',
type: 'cancel' type: 'cancel'
}); });
} else {
items.push({
name: globalize.translate('HeaderCancelRecording'),
id: 'canceltimer',
type: 'cancel'
});
}
dialog({ items.push({
name: globalize.translate('HeaderCancelSeries'),
text: globalize.translate('MessageConfirmRecordingCancellation'), id: 'cancelseriestimer',
buttons: items type: 'cancel'
}).then(function (result) {
const apiClient = ServerConnections.getApiClient(serverId);
if (result === 'canceltimer') {
loading.show();
cancelTimer(apiClient, timerId, true).then(resolve, reject);
} else if (result === 'cancelseriestimer') {
loading.show();
apiClient.cancelLiveTvSeriesTimer(seriesTimerId).then(function () {
toast(globalize.translate('SeriesCancelled'));
loading.hide();
resolve();
}, reject);
} else {
resolve();
}
}, reject);
}); });
dialog.show({
text: globalize.translate('MessageConfirmRecordingCancellation'),
buttons: items
}).then(function (result) {
const apiClient = ServerConnections.getApiClient(serverId);
if (result === 'canceltimer') {
loading.show();
cancelTimer(apiClient, timerId, true).then(resolve, reject);
} else if (result === 'cancelseriestimer') {
loading.show();
apiClient.cancelLiveTvSeriesTimer(seriesTimerId).then(function () {
toast(globalize.translate('SeriesCancelled'));
loading.hide();
resolve();
}, reject);
} else {
resolve();
}
}, reject);
}); });
} }