From 1833b348e9965f30008b914bf35ce429bb033b33 Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Wed, 5 Aug 2020 11:35:05 +0900
Subject: [PATCH] Merge pull request #1748 from dmitrylyzo/fix-old-edge

Fix old Edge loading

(cherry picked from commit 73e3a94755bcaf86c29f4d10385a97c7422da645)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
---
 src/scripts/site.js | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/scripts/site.js b/src/scripts/site.js
index a292a92d94..22a635136b 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -623,6 +623,7 @@ var AppInfo = {};
     }
 
     var localApiClient;
+    let promise;
 
     (function () {
         var urlArgs = 'v=' + (window.dashboardVersion || new Date().getDate());
@@ -706,20 +707,12 @@ var AppInfo = {};
             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']);
+        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;
+                window.jQuery = jQuery;
+            }));
 
         // define styles
         // 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 () {