From 4b84e6c0aa97d53be1996941591c762126251116 Mon Sep 17 00:00:00 2001
From: Dmitry Lyzo <ashephard0@gmail.com>
Date: Tue, 4 Aug 2020 00:51:19 +0300
Subject: [PATCH 1/2] Fix old Edge loading

---
 src/scripts/site.js | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/scripts/site.js b/src/scripts/site.js
index 604f9c7ba..ab8e17971 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -696,20 +696,12 @@ function initClient() {
             onError: onRequireJsError
         });
 
-        require(['fetch']);
-        require(['polyfill']);
-        require(['fast-text-encoding']);
-        require(['intersection-observer']);
-        require(['classlist-polyfill']);
-
-        // Expose jQuery globally
-        require(['jQuery'], function(jQuery) {
-            window.$ = jQuery;
-            window.jQuery = jQuery;
-        });
-
-        require(['css!assets/css/site']);
-        require(['jellyfin-noto']);
+        require(['fetch'])
+            .then(() => require(['jQuery', 'polyfill', 'fast-text-encoding', 'intersection-observer', 'classlist-polyfill', 'css!assets/css/site', 'jellyfin-noto'], (jQuery) => {
+                // Expose jQuery globally
+                window.$ = jQuery;
+                window.jQuery = jQuery;
+            }));
 
         // define styles
         // TODO determine which of these files can be moved to the components themselves

From 07a54e93039593b9f66769951f6aa34d044528e8 Mon Sep 17 00:00:00 2001
From: Dmitry Lyzo <ashephard0@gmail.com>
Date: Tue, 4 Aug 2020 09:39:34 +0300
Subject: [PATCH 2/2] Wait for initialization to complete

---
 src/scripts/site.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/scripts/site.js b/src/scripts/site.js
index ab8e17971..cd85c35e8 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -615,6 +615,7 @@ function initClient() {
     }
 
     var localApiClient;
+    let promise;
 
     (function () {
         var urlArgs = 'v=' + (window.dashboardVersion || new Date().getDate());
@@ -696,7 +697,7 @@ function initClient() {
             onError: onRequireJsError
         });
 
-        require(['fetch'])
+        promise = require(['fetch'])
             .then(() => require(['jQuery', 'polyfill', 'fast-text-encoding', 'intersection-observer', 'classlist-polyfill', 'css!assets/css/site', 'jellyfin-noto'], (jQuery) => {
                 // Expose jQuery globally
                 window.$ = jQuery;
@@ -1107,7 +1108,7 @@ function initClient() {
         });
     })();
 
-    return onWebComponentsReady();
+    promise.then(onWebComponentsReady);
 }
 
 initClient();