Merge pull request #506 from bmlt-enabled/Fix-for-#497

Fix-for-#497

crouton.php

@@ -5,7 +5,7 @@
 Description: A tabbed based display for showing meeting information.
 Author: bmlt-enabled
 Author URI: https://bmlt.app
-Version: 3.20.6
+Version: 3.20.7
 */
 /* Disallow direct access to the plugin file */
 if (basename($_SERVER['PHP_SELF']) == basename(__FILE__)) {
@@ -48,6 +48,7 @@ class Crouton
             ),
             'timeout' => 60
         );
+        const END_WAIT_MESSAGE = "document.getElementById('please-wait').style.display='none';";
         // crouton includes a map, we need to include the JS files and create the croutonMap object.
         public $shortCodeOptions = array(
             "root_server" => '',
@@ -372,17 +373,17 @@ private function getInitializeCroutonBlock($renderCmd, $config, $mapConfig)
 
         private function renderTable($atts)
         {
-            return $this->getInitializeCroutonBlock("crouton.render();document.getElementById('please-wait').style.display='none';", ...$this->getCroutonJsConfig($atts));
+            return $this->getInitializeCroutonBlock("crouton.render();".Crouton::END_WAIT_MESSAGE, ...$this->getCroutonJsConfig($atts));
         }
 
         private function renderMap($atts, $croutonMap = true)
         {
             if ($croutonMap) {
                 // This loads a map in which BMLT queries can be initiated
-                return $this->getInitializeCroutonBlock("crouton.searchMap();", ...$this->getCroutonJsConfig($atts, true));
+                return $this->getInitializeCroutonBlock("crouton.searchMap();".Crouton::END_WAIT_MESSAGE, ...$this->getCroutonJsConfig($atts, true));
             }
             // This is the map UI, but loading meetings like in the table form, only at startu
-            return $this->getInitializeCroutonBlock("crouton.render(true);", ...$this->getCroutonJsConfig($atts));
+            return $this->getInitializeCroutonBlock("crouton.render(true);".Crouton::END_WAIT_MESSAGE, ...$this->getCroutonJsConfig($atts));
         }
 
         public function initCrouton($atts)

croutonjs/meetingMap/js/meeting_map.js

@@ -197,7 +197,9 @@ function MeetingMap(inConfig) {
 
 		return controlDiv;
 	}
-
+	function hasMapSearch() {
+		return 'map_search' in config;
+	}
 	function loadFromCrouton(inDiv_id, meetings_responseObject, menuContext = null, handlebarMapOptions = null, fitBounds = true, callback) {
 		if (!gDelegate.isApiLoaded()) {
 			preloadApiLoadedCallback(loadFromCrouton, [inDiv_id, meetings_responseObject, menuContext, handlebarMapOptions, fitBounds, callback]);
@@ -724,6 +726,7 @@ function MeetingMap(inConfig) {
 	this.closeModalWindow = closeModalWindow;
 	this.loadPopupMap = loadPopupMap;
 	this.filterVisible = filterVisible;
+	this.hasMapSearch = hasMapSearch;
 };
 MeetingMap.prototype.initialize = null;
 MeetingMap.prototype.showMap = null;
@@ -736,3 +739,4 @@ MeetingMap.prototype.openModalWindow = null;
 MeetingMap.prototype.closeModalWindow = null;
 MeetingMap.prototype.loadPopupMap = null;
 MeetingMap.prototype.filterVisible = null;
+MeetingMap.prototype.hasMapSearch = null;

croutonjs/src/js/crouton-core.js

@@ -897,7 +897,7 @@ function Crouton(config) {
 		if (self.config['map_search']) self.searchMap();
 		else self.meetingSearch();
 	}
-	else if (!self.config['map_search']) self.meetingSearch();
+	else if (!window.croutonMap.hasMapSearch()) self.meetingSearch();
 }
 
 Crouton.prototype.setConfig = function(config) {

readme.txt

@@ -5,7 +5,7 @@ Tags: na, meeting list, meeting finder, maps, recovery, addiction, webservant, b
 Requires at least: 4.0
 Required PHP: 8.0
 Tested up to: 6.6.2
-Stable tag: 3.20.6
+Stable tag: 3.20.7
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 crouton implements a Tabbed UI for BMLT.
@@ -36,6 +36,10 @@ https://demo.bmlt.app/crouton
 
 == Changelog ==
 
+= 3.20.7 =
+* Assure "Fetching" message is deleted.
+* Remove unnecessary call to root server.
+
 = 3.20.6 =
 * Fix for 3.20.5