milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Fix old Edge loading
This commit is contained in:
dkanada 2020-08-05 11:35:05 +09:00 • committed by GitHub
commit 73e3a94755
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/scripts/site.js
View file

@ -615,6 +615,7 @@ function initClient() {
} }
var localApiClient; var localApiClient;
let promise;
(function () { (function () {
var urlArgs = 'v=' + (window.dashboardVersion || new Date().getDate()); var urlArgs = 'v=' + (window.dashboardVersion || new Date().getDate());
@ -696,20 +697,12 @@ function initClient() {
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']);
require(['intersection-observer']);
require(['classlist-polyfill']);
// Expose jQuery globally // Expose jQuery globally
require(['jQuery'], function(jQuery) {
window.$ = jQuery; window.$ = jQuery;
window.jQuery = 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
@ -1115,7 +1108,7 @@ function initClient() {
}); });
})(); })();
return onWebComponentsReady(); promise.then(onWebComponentsReady);
} }
initClient(); initClient();