Defer all JavaScript

ExE-Boss · ExE-Boss · commit 8361a4eeb007 · 2017-10-05T21:42:47.000+02:00
diff --git a/src/options/options.js b/src/options/options.js
@@ -18,8 +18,10 @@
 /* global browser */
 
 document.addEventListener("DOMContentLoaded", async () => {
-	i18nInit();
-	initOptions();
+	return Promise.all([
+		i18nInit(),
+		initOptions()
+	]);
 });
 
 async function initOptions() {
diff --git a/src/options/options.xhtml b/src/options/options.xhtml
@@ -23,8 +23,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 		<link rel="stylesheet" type="text/css" href="options.css"/>
 		<link rel="stylesheet" type="text/css" href="/browser-style-supplement/extension-options.css"/>
-		<script type="application/javascript" src="/shared.js"/>
-		<script type="application/javascript" src="options.js"/>
+		<script type="application/javascript" defer="true" src="/shared.js"/>
+		<script type="application/javascript" defer="true" src="options.js"/>
 	</head>
 	<body>
 		<h1 class="browser-style" data-i18n="options_header"/>
diff --git a/src/popup/popup.js b/src/popup/popup.js
@@ -92,13 +92,13 @@ async function loadIcons() {
 
 				let hasSrcOS = false;
 				try {
-					hasSrcOS = (await fetch(srcOS)).ok; // Doesn’t work in 57
+					hasSrcOS = (await fetch(srcOS)).ok; // Doesn’t work when loaded from file:// URLs
 				} catch (err) {}
 
 				icon.addEventListener("error", err => {
 					let i2 = document.createElement("img");
 					i2.classList.add("icon", "eb-icon");
-					// Fix for Firefox 57:
+					// Fix for file:// URLs:
 					if (hasSrcOS) {
 						i2.setAttribute("src", src);
 						i2.addEventListener("error", err => {
diff --git a/src/popup/popup.xhtml b/src/popup/popup.xhtml
@@ -22,8 +22,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		<title>Application Menu</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 		<link rel="stylesheet" type="text/css" href="popup.css"/>
-		<script type="application/javascript" src="/shared.js"/>
-		<script type="application/javascript" src="popup.js"/>
+		<script type="application/javascript" defer="true" src="/shared.js"/>
+		<script type="application/javascript" defer="true" src="popup.js"/>
 	</head>
 	<body>
 		<main id="main" class="panel-section">
