Merge branch 'master' into migrate-to-ES6-58

2020-08-07 09:29:15 +01:00
parent b8c4871004 c5550c5771
commit b44ca55f0c
57 changed files with 3305 additions and 3026 deletions
@@ -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) {