From 1122b5b5d9e03dc342bf09ef6694fe6b6d7a7cab Mon Sep 17 00:00:00 2001
From: Bill Thornton <billt2006@gmail.com>
Date: Sat, 15 Jun 2019 00:21:40 -0400
Subject: [PATCH] Simplify apploader code

---
 src/scripts/apploader.js | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/scripts/apploader.js b/src/scripts/apploader.js
index 61adfce69e..9067ae6070 100644
--- a/src/scripts/apploader.js
+++ b/src/scripts/apploader.js
@@ -1,24 +1,29 @@
 (function() {
     "use strict";
 
-    function loadApp() {
-        var script = document.createElement("script"),
-            src = "./scripts/site.js";
+    function injectScriptElement(src, onload) {
+        if (!src) {
+            return;
+        }
+
+        var script = document.createElement("script");
         if (self.dashboardVersion) {
             src += "?v=" + self.dashboardVersion;
         }
         script.src = src;
+
+        if (onload) {
+            script.onload = onload;
+        }
+
         document.head.appendChild(script);
     }
 
-    (function() {
-        var src, script = document.createElement("script");
-        src = self.Promise ? "./bower_components/alameda/alameda.js" : "./bower_components/requirejs/require.js";
-        if (self.dashboardVersion) {
-            src += "?v=" + self.dashboardVersion;
+    injectScriptElement(
+        self.Promise ? "./bower_components/alameda/alameda.js" : "./bower_components/requirejs/require.js",
+        function() {
+            // onload of require library
+            injectScriptElement("./scripts/site.js");
         }
-        script.src = src;
-        script.onload = loadApp;
-        document.head.appendChild(script);
-    })();
+    );
 })();