Merge pull request #463 from bmlt-enabled/version-bump-did-not-includ…

…e-all-commits

Fixes to some issues for non-wordpress scenarios

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.18.4
+Version: 3.18.5
 */
 /* Disallow direct access to the plugin file */
 if (basename($_SERVER['PHP_SELF']) == basename(__FILE__)) {

croutonjs/src/js/crouton-core.js

@@ -499,6 +499,10 @@ function Crouton(config) {
 	self.updateMeetingCount = function(showingNow=null) {
 		self = this;
 		let meetingCount = self.meetingData.length;
+		if (self.meetingCountCallback) self.meetingCountCallback(meetingCount);
+		if (self.groupCountCallback) self.groupCountCallback(
+			arrayUnique(self.meetingData.map((m)=>m['worldid_mixed'] !== "" ? m['worldid_mixed'] :m['meeting_name'])).length
+		);
 		addLive = function(id) {return id+", "+id+"-live"};
 		if (showingNow !== null) {
 			meetingCount = showingNow.length;
@@ -644,6 +648,14 @@ function Crouton(config) {
 			croutonMap.loadPopupMap("bmlt-handlebars-map", meetingDetailsData, self.handlebarMapOptions);
 		}
 	}
+	self.meetingCountCallback = null;
+	self.grouoCountCallback = null;
+	Crouton.prototype.meetingCount = function(f) {
+		self.meetingCountCallback = f;
+	}
+	Crouton.prototype.groupCount = function(f) {
+		self.groupCountCallback = f;
+	}
 	Crouton.prototype.filterNext24 = function(filterNow = true) {
 		if (!filterNow) {
 			jQuery("#filter-dropdown-next24").val('a-');
@@ -856,7 +868,7 @@ function Crouton(config) {
 		}
 		return 'bmlt-map';
 	}
-	if ((self.config['show_map'] || self.config['map_search']) && (typeof window.croutonMap === 'undefined')) {
+	if (typeof window.croutonMap === 'undefined') {
 		window.croutonMap = new MeetingMap(self.config);
 		if (self.config['map_search']) self.searchMap();
 	}

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.4.2
-Stable tag: 3.18.4
+Stable tag: 3.18.5
 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.18.5 =
+* Assure croutonMap object created.
+* Add meetingCount and groupCount methods for backwards compatibility in non-wordpress cases.
+
 = 3.18.4 =
 * Do not embed map page when list contains only online meetings (fix for bug #460).