Merge pull request #7 from MurdoMaclachlan/dev

Patch to fix additional scripts not running

Author: MollyMaclachlan

pages/accounts.html

@@ -406,9 +406,9 @@ <h2>
         <div id="footer-container">
             <!-- Footer will be inserted here -->
         </div>
+        <div id="scripts">
+            <!-- Scripts (secondary scripts inserted during constructor runtime) -->
+            <script id="constructor" src="../scripts/js/constructor.js"></script>
+        </div>
     </body>
-
-    <!-- Scripts (secondary scripts inserted during constructor runtime) -->
-    <script id="constructor" src="../scripts/js/constructor.js"></script>
-
 </html>

pages/blog.html

@@ -31,9 +31,9 @@
         <div id="footer-container">
             <!-- Footer will be inserted here -->
         </div>
+        <div id="scripts">
+            <!-- Scripts (secondary scripts inserted during constructor runtime) -->
+            <script id="constructor" src="../scripts/js/constructor.js"></script>
+        </div>
     </body>
-
-    <!-- Scripts (secondary scripts inserted during constructor runtime) -->
-    <script id="constructor" src="../scripts/js/constructor.js"></script>
-
 </html>

pages/endeavours.html

@@ -118,9 +118,9 @@ <h2><a id="#writing" href="#writing">Writing</a></h2>
         <div id="footer-container">
             <!-- Footer will be inserted here -->
         </div>
+        <div id="scripts">
+            <!-- Scripts (secondary scripts inserted during constructor runtime) -->
+            <script id="constructor" src="../scripts/js/constructor.js"></script>
+        </div>
     </body>
-
-    <!-- Scripts (secondary scripts inserted during constructor runtime) -->
-    <script id="constructor" src="../scripts/js/constructor.js"></script>
-
 </html>

pages/home.html

@@ -68,9 +68,9 @@ <h2><a id="#about-me" href="#about-me">About Me</a></h2>
         <div id="footer-container">
             <!-- Footer will be inserted here -->
         </div>
+        <div id="scripts">
+            <!-- Scripts (secondary scripts inserted during constructor runtime) -->
+            <script id="constructor" src="../scripts/js/constructor.js"></script>
+        </div>
     </body>
-
-    <!-- Scripts (secondary scripts inserted during constructor runtime) -->
-    <script id="constructor" src="../scripts/js/constructor.js"></script>
-
 </html>

pages/legal.html

@@ -67,9 +67,9 @@ <h2><a id="#licensing" href="#licensing">Licensing</a></h2>
         <div id="footer-container">
             <!-- Footer will be inserted here -->
         </div>
+        <div id="scripts">
+            <!-- Scripts (secondary scripts inserted during constructor runtime) -->
+            <script id="constructor" src="../scripts/js/constructor.js"></script>
+        </div>
     </body>
-
-    <!-- Scripts (secondary scripts inserted during constructor runtime) -->
-    <script id="constructor" src="../scripts/js/constructor.js"></script>
-
 </html>

scripts/js/constructor.js

@@ -49,9 +49,10 @@ var structures = {
         </section>
     </footer>`
 }
-var secondaryScripts =
-    `<script src="../scripts/js/themes.js"></script>
-    <script src="../scripts/js/events.js"></script>`;
+var secondaryScripts = [
+    "../scripts/js/themes.js",
+    "../scripts/js/events.js"
+];
 
 construct();
 
@@ -66,7 +67,9 @@ function construct() {
     processSelectedButton();
 
     // Insert other universal scripts
-    insertSnippet("afterend", "constructor", secondaryScripts)
+    for (let i = 0; i < secondaryScripts.length; i++) {
+        insertScript(secondaryScripts[i])
+    }
 }
 
 // Inserts an HTML snippet at a given position relative to a unique element
@@ -75,6 +78,14 @@ function insertSnippet(position, id, snippet) {
     element.insertAdjacentHTML(position, snippet);
 }
 
+// Inserts a script tag at the given location
+function insertScript(source) {
+    let script = document.createElement('script');
+    let location = document.getElementById('scripts');
+    script.src = source;
+    location.appendChild(script);
+}
+
 // Marks one of the nav buttons as selected if the page is a primary one
 function processSelectedButton() {
     let title = document.title.split(" | ")[1].toLowerCase();