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 migrate-to-ES6-58

Browse source
This commit is contained in:
Cameron 2020-08-07 09:29:15 +01:00 • committed by GitHub
commit b44ca55f0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
57 changed files with 3305 additions and 3026 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/controllers/livetv/livetvsuggested.js
View file

@ -170,9 +170,6 @@ define(['layoutManager', 'userSettings', 'inputManager', 'loading', 'globalize',
name: globalize.translate('HeaderSchedule')
}, {
name: globalize.translate('TabSeries')
}, {
name: globalize.translate('ButtonSearch'),
cssClass: 'searchTabButton'
}];
}
@ -256,9 +253,6 @@ define(['layoutManager', 'userSettings', 'inputManager', 'loading', 'globalize',
case 5:
depends.push('controllers/livetv/livetvseriestimers');
break;
case 6:
depends.push('scripts/searchtab');
}
require(depends, function (controllerFactory) {