From f43fb0d919802d7cb16059ff431a93a56baf0372 Mon Sep 17 00:00:00 2001
From: int2001 <joerg@dj7nt.de>
Date: Fri, 15 Dec 2023 08:03:32 +0000
Subject: [PATCH] Putted modalloading only to gridmap.js

---
 application/views/gridmap/index.php           |   1 -
 .../js/leaflet/L.MaidenheadColouredGridMap.js |   3 -
 assets/js/sections/gridmap.js                 | 109 +++++++++---------
 3 files changed, 57 insertions(+), 56 deletions(-)

diff --git a/application/views/gridmap/index.php b/application/views/gridmap/index.php
index 8fae814a..b6e7d3db 100644
--- a/application/views/gridmap/index.php
+++ b/application/views/gridmap/index.php
@@ -147,7 +147,6 @@
 </div>
 <script>
 var gridsquaremap = true;
-var modalloading = false;
 var type = "worked";
 <?php if ($visitor == true) { ?>
 var visitor = true;
diff --git a/assets/js/leaflet/L.MaidenheadColouredGridMap.js b/assets/js/leaflet/L.MaidenheadColouredGridMap.js
index d225fa2d..bf51d8e6 100644
--- a/assets/js/leaflet/L.MaidenheadColouredGridMap.js
+++ b/assets/js/leaflet/L.MaidenheadColouredGridMap.js
@@ -130,10 +130,7 @@ L.Maidenhead = L.LayerGroup.extend({
 		}
 		if (typeof gridsquaremap !== 'undefined' && gridsquaremap == true) {
 			marker.on('click', function(event) {
-				if (!(modalloading)) {
-				modalloading=true;
 				spawnGridsquareModal(locator);
-				}
 			});
 		}
 		return marker;
diff --git a/assets/js/sections/gridmap.js b/assets/js/sections/gridmap.js
index 6155f2bb..7a861d16 100644
--- a/assets/js/sections/gridmap.js
+++ b/assets/js/sections/gridmap.js
@@ -1,3 +1,5 @@
+var modalloading=false;
+
 $('#band').change(function(){
 	var band = $("#band option:selected").text();
 	if (band != "SAT") {
@@ -124,59 +126,62 @@ function plot(visitor, grid_two, grid_four, grid_six, grid_two_confirmed, grid_f
 }
 
 function spawnGridsquareModal(loc_4char) {
-    var ajax_data = ({
-       'Searchphrase': loc_4char,
-       'Band': $("#band").val(),
-       'Mode': $("#mode").val(),
-       'Type': 'VUCC'
-    })
-    if (type == 'activated') {
-       ajax_data.searchmode = 'activated';
-    }
-    $.ajax({
-        url: base_url + 'index.php/awards/qso_details_ajax',
-        type: 'post',
-        data: ajax_data,
-        success: function (html) {
-            BootstrapDialog.show({
-                title: lang_general_word_qso_data,
-                cssClass: 'qso-dialog',
-                size: BootstrapDialog.SIZE_WIDE,
-                nl2br: false,
-                message: html,
-                onshown: function(dialog) {
-		    modalloading=false;
-                    $('[data-bs-toggle="tooltip"]').tooltip();
-                    $('.contacttable').DataTable({
-                            "pageLength": 25,
-                            responsive: false,
-                            ordering: false,
-                            "scrollY":        "550px",
-                            "scrollCollapse": true,
-                            "paging":         false,
-                            "scrollX": true,
-                            dom: 'Bfrtip',
-                            buttons: [
-                                'csv'
-                            ]
-                        });
-                            // change color of csv-button if dark mode is chosen
-                    if (isDarkModeTheme()) {
-                        $(".buttons-csv").css("color", "white");
-                    }
-                    },
-                buttons: [{
-                    label: lang_admin_close,
-                    action: function(dialogItself) {
-                        dialogItself.close();
-                    }
-                }]
-            });
-        },
-	error: function(e) {
-		modalloading=false;
+	if (!(modalloading)) {
+		var ajax_data = ({
+			'Searchphrase': loc_4char,
+			'Band': $("#band").val(),
+			'Mode': $("#mode").val(),
+			'Type': 'VUCC'
+		})
+		if (type == 'activated') {
+			ajax_data.searchmode = 'activated';
+		}
+		modalloading=true;
+		$.ajax({
+			url: base_url + 'index.php/awards/qso_details_ajax',
+			type: 'post',
+			data: ajax_data,
+			success: function (html) {
+				BootstrapDialog.show({
+					title: lang_general_word_qso_data,
+					cssClass: 'qso-dialog',
+					size: BootstrapDialog.SIZE_WIDE,
+					nl2br: false,
+					message: html,
+					onshown: function(dialog) {
+						modalloading=false;
+						$('[data-bs-toggle="tooltip"]').tooltip();
+						$('.contacttable').DataTable({
+							"pageLength": 25,
+							responsive: false,
+							ordering: false,
+							"scrollY":        "550px",
+							"scrollCollapse": true,
+							"paging":         false,
+							"scrollX": true,
+							dom: 'Bfrtip',
+							buttons: [
+								'csv'
+							]
+						});
+						// change color of csv-button if dark mode is chosen
+						if (isDarkModeTheme()) {
+							$(".buttons-csv").css("color", "white");
+						}
+					},
+					buttons: [{
+						label: lang_admin_close,
+						action: function(dialogItself) {
+							dialogItself.close();
+						}
+					}]
+				});
+			},
+			error: function(e) {
+				modalloading=false;
+			}
+		});
 	}
-    });
 }
 
 function clearMarkers() {