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 remote-tracking branch 'origin/master' into hwa-web

Browse source
This commit is contained in:
nyanmisaka 2021-12-24 01:33:16 +08:00
commit 24dbd881d2
73 changed files with 4546 additions and 1788 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/controllers/playback/video/index.js
View file

@ -399,6 +399,15 @@ import { appRouter } from '../../../components/appRouter';
case 'togglestats':
toggleStats();
break;
case 'back':
// Ignore command when some dialog is opened
if (currentVisibleMenu === 'osd' && !getOpenedDialog()) {
hideOsd();
e.preventDefault();
}
break;
}
}