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

merge branch master into standalone

Browse source
This commit is contained in:
dkanada 2020-11-07 15:18:38 +09:00
commit e60f01b3a3
50 changed files with 860 additions and 300 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/apphost.js
View file

@ -172,7 +172,6 @@ function supportsCue() {
function onAppVisible() {
if (isHidden) {
isHidden = false;
console.debug('triggering app resume event');
events.trigger(appHost, 'resume');
}
}
@ -180,7 +179,6 @@ function onAppVisible() {
function onAppHidden() {
if (!isHidden) {
isHidden = true;
console.debug('app is hidden');
}
}

6
src/components/subtitleeditor/subtitleeditor.js
View file

@ -1,3 +1,4 @@
import appHost from 'apphost';
import dialogHelper from 'dialogHelper';
import layoutManager from 'layoutManager';
import globalize from 'globalize';
@ -388,6 +389,11 @@ function showEditorInternal(itemId, serverId, template) {
btnSubmit.classList.add('hide');
}
// Don't allow redirection to other websites from the TV layout
if (layoutManager.tv || !appHost.supports('externallinks')) {
dlg.querySelector('.btnHelp').remove();
}
const editorContent = dlg.querySelector('.formDialogContent');
dlg.querySelector('.subtitleList').addEventListener('click', onSubtitleListClick);