1
0
Fork 0
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:
Luke Pulverenti 2016-01-19 14:49:42 -05:00
parent bcfee41a57
commit d33230d361
97 changed files with 1205 additions and 811 deletions

View file

@ -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) {