From bc50c26e13210251598bc77b60e8bb237a08d58c Mon Sep 17 00:00:00 2001
From: Brian Evans <grknight@gentoo.org>
Date: Fri, 12 Apr 2019 11:07:41 -0400
Subject: Always ensure that jQuery is loaded before Bootstrap is

Signed-off-by: Brian Evans <grknight@gentoo.org>
---
 SkinTyrian.php     | 16 ++++++++++++++++
 TyrianTemplate.php |  1 -
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/SkinTyrian.php b/SkinTyrian.php
index eddc5fd..69fdd05 100644
--- a/SkinTyrian.php
+++ b/SkinTyrian.php
@@ -39,4 +39,20 @@ class SkinTyrian extends SkinTemplate {
 		$out->addMeta('theme-color', '#54487a');
 		return true;
 	}
+
+	public function initPage( OutputPage $out ) {
+		parent::initPage( $out );
+		$cdnURL = self::CDN_URL . 'bootstrap.min.js';
+		$script = <<<EOS
+function defer(method) {
+    if (window.jQuery) {
+        method();
+    } else {
+        setTimeout(function() { defer(method) }, 50);
+    }
+}
+defer(function() { mw.loader.load( '$cdnURL'); });
+EOS;
+		$out->addInlineScript($script);
+	}
 }
diff --git a/TyrianTemplate.php b/TyrianTemplate.php
index eb6b660..3623321 100644
--- a/TyrianTemplate.php
+++ b/TyrianTemplate.php
@@ -65,7 +65,6 @@ class TyrianTemplate extends BaseTemplate {
 
 		<?php
 		$this->footer();
-		echo ResourceLoader::makeInlineScript('mw.loader.load("https://assets.gentoo.org/tyrian/bootstrap.min.js");');
 		$this->printTrail();
 		echo Html::closeElement( 'body' );
 		echo Html::closeElement( 'html' );
-- 
cgit v1.2.3-65-gdbad