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

Fix merge conflicts

Browse source
This commit is contained in:
ferferga 2020-04-12 20:26:59 +02:00
commit 155e9eb7ad
54 changed files with 1090 additions and 481 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/components/nowplayingbar/nowplayingbar.js
View file

@ -237,8 +237,9 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
};
elem.addEventListener('click', function (e) {
if (!dom.parentWithTag(e.target, ['BUTTON', 'INPUT'])) {
showRemoteControl(0);
showRemoteControl();
}
});
}