mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
fix merge conflicts
This commit is contained in:
parent
bcfee41a57
commit
d33230d361
97 changed files with 1205 additions and 811 deletions
|
@ -478,9 +478,9 @@
|
|||
var tabContent = options.element;
|
||||
tabContent.innerHTML = Globalize.translateDocument(template);
|
||||
|
||||
Events.on(tabContent.querySelector('.programGrid'), 'scroll', function () {
|
||||
tabContent.querySelector('.programGrid').addEventListener('scroll', function (e) {
|
||||
|
||||
onProgramGridScroll(tabContent, this);
|
||||
onProgramGridScroll(tabContent, e.target);
|
||||
});
|
||||
|
||||
if (browserInfo.mobile) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue