1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

Merge pull request #1748 from dmitrylyzo/fix-old-edge

Fix old Edge loading

(cherry picked from commit 73e3a94755)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
This commit is contained in:
dkanada 2020-08-05 11:35:05 +09:00 committed by Joshua M. Boniface
parent ccb74610aa
commit 1833b348e9

View file

@ -623,6 +623,7 @@ var AppInfo = {};
} }
var localApiClient; var localApiClient;
let promise;
(function () { (function () {
var urlArgs = 'v=' + (window.dashboardVersion || new Date().getDate()); var urlArgs = 'v=' + (window.dashboardVersion || new Date().getDate());
@ -706,20 +707,12 @@ var AppInfo = {};
onError: onRequireJsError onError: onRequireJsError
}); });
require(['fetch']); promise = require(['fetch'])
require(['polyfill']); .then(() => require(['jQuery', 'polyfill', 'fast-text-encoding', 'intersection-observer', 'classlist-polyfill', 'css!assets/css/site', 'jellyfin-noto'], (jQuery) => {
require(['fast-text-encoding']); // Expose jQuery globally
require(['intersection-observer']); window.$ = jQuery;
require(['classlist-polyfill']); window.jQuery = jQuery;
}));
// Expose jQuery globally
require(['jQuery'], function(jQuery) {
window.$ = jQuery;
window.jQuery = jQuery;
});
require(['css!assets/css/site']);
require(['jellyfin-noto']);
// define styles // define styles
// TODO determine which of these files can be moved to the components themselves // TODO determine which of these files can be moved to the components themselves
@ -1130,7 +1123,7 @@ var AppInfo = {};
}); });
})(); })();
return onWebComponentsReady(); promise.then(onWebComponentsReady);
}(); }();
pageClassOn('viewshow', 'standalonePage', function () { pageClassOn('viewshow', 'standalonePage', function () {