From cb924857b9f3e5cfd6a2d1d19086c67d4cb292d8 Mon Sep 17 00:00:00 2001
From: Kevin Raaijmakers <kraaijmakers@outlook.com>
Date: Mon, 11 Jun 2018 19:39:25 +0200
Subject: [PATCH] Theme Bootstrap: Fixed a ReferenceError of jQuery (#181)

* Fixed a ReferenceError of jQuery which got accessed before the jQuery
itself got imported.

* Fixed ReferenceError $.
Restructured the footer.php and moved the script which references to
jQuery after the initial jQuery import.
---
 themes/bootstrap/footer.php | 88 +++++++++++++++++++------------------
 1 file changed, 45 insertions(+), 43 deletions(-)

diff --git a/themes/bootstrap/footer.php b/themes/bootstrap/footer.php
index 3efdde93..5cb65c2e 100644
--- a/themes/bootstrap/footer.php
+++ b/themes/bootstrap/footer.php
@@ -37,6 +37,50 @@
 		<script src="<?php echo $this->themePath('js/ie9.js') ?>" type="text/javascript"></script>
 		<script type="text/javascript" src="<?php echo $this->themePath('js/flux.unitpngfix.js') ?>"></script>
 		<![endif]-->
+		
+		<script type="text/javascript">
+			function updatePreferredServer(sel){
+				var preferred = sel.options[sel.selectedIndex].value;
+				document.preferred_server_form.preferred_server.value = preferred;
+				document.preferred_server_form.submit();
+			}
+			
+			function updatePreferredTheme(sel){
+				var preferred = sel.options[sel.selectedIndex].value;
+				document.preferred_theme_form.preferred_theme.value = preferred;
+				document.preferred_theme_form.submit();
+			}
+
+			// Preload spinner image.
+			var spinner = new Image();
+			spinner.src = '<?php echo $this->themePath('img/spinner.gif') ?>';
+			
+			function refreshSecurityCode(imgSelector){
+				$(imgSelector).attr('src', spinner.src);
+				
+				// Load image, spinner will be active until loading is complete.
+				var clean = <?php echo Flux::config('UseCleanUrls') ? 'true' : 'false' ?>;
+				var image = new Image();
+				image.src = "<?php echo $this->url('captcha') ?>"+(clean ? '?nocache=' : '&nocache=')+Math.random();
+				
+				$(imgSelector).attr('src', image.src);
+			}
+			function toggleSearchForm()
+			{
+				//$('.search-form').toggle();
+				$('.search-form').slideToggle('fast');
+			}
+		</script>
+		
+		<?php if (Flux::config('EnableReCaptcha') && Flux::config('ReCaptchaTheme')): ?>
+			<script type="text/javascript">
+				 var RecaptchaOptions = {
+					theme : '<?php echo Flux::config('ReCaptchaTheme') ?>'
+				 };
+			</script>
+		<?php endif ?>
+		
+		<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
 		<script type="text/javascript">
 			$(document).ready(function(){
 				var inputs = 'input[type=text],input[type=password],input[type=file]';
@@ -87,51 +131,9 @@ function reload(){
 				window.location.href = '<?php echo $this->url ?>';
 			}
 		</script>
-		
-		<script type="text/javascript">
-			function updatePreferredServer(sel){
-				var preferred = sel.options[sel.selectedIndex].value;
-				document.preferred_server_form.preferred_server.value = preferred;
-				document.preferred_server_form.submit();
-			}
-			
-			function updatePreferredTheme(sel){
-				var preferred = sel.options[sel.selectedIndex].value;
-				document.preferred_theme_form.preferred_theme.value = preferred;
-				document.preferred_theme_form.submit();
-			}
 
-			// Preload spinner image.
-			var spinner = new Image();
-			spinner.src = '<?php echo $this->themePath('img/spinner.gif') ?>';
-			
-			function refreshSecurityCode(imgSelector){
-				$(imgSelector).attr('src', spinner.src);
-				
-				// Load image, spinner will be active until loading is complete.
-				var clean = <?php echo Flux::config('UseCleanUrls') ? 'true' : 'false' ?>;
-				var image = new Image();
-				image.src = "<?php echo $this->url('captcha') ?>"+(clean ? '?nocache=' : '&nocache=')+Math.random();
-				
-				$(imgSelector).attr('src', image.src);
-			}
-			function toggleSearchForm()
-			{
-				//$('.search-form').toggle();
-				$('.search-form').slideToggle('fast');
-			}
-		</script>
-		
-		<?php if (Flux::config('EnableReCaptcha') && Flux::config('ReCaptchaTheme')): ?>
-		<script type="text/javascript">
-			 var RecaptchaOptions = {
-			    theme : '<?php echo Flux::config('ReCaptchaTheme') ?>'
-			 };
-		</script>
-		<?php endif ?>
 		<script type="text/javascript" src="<?php echo $this->themePath('js/flux.datefields.js') ?>"></script>
 		<script type="text/javascript" src="<?php echo $this->themePath('js/flux.unitip.js') ?>"></script>
-	<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
-	<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+		<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
 	</body>
 </html>