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

2020-08-06 08:47:03 +01:00 · 2020-08-06 08:47:03 +01:00 · c1f05ea169
commit c1f05ea169
parent f3c0049982 98481fc450
79 changed files with 755 additions and 1512 deletions
--- a/src/controllers/list.js
+++ b/src/controllers/list.js
@ -3,6 +3,7 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'

    playbackManager = playbackManager.default || playbackManager;
    loading = loading.default || loading;
+    focusManager = focusManager.default || focusManager;

    function getInitialLiveTvQuery(instance, params) {
        var query = {