@bmlt-enabled/croutonjs 3.18.0 → 3.18.1

package/crouton.css

@@ -1780,6 +1780,13 @@ div.bmlt_map_container_div  button {
     color: #2d5c88 !important;
 
 }
+#map-search-button {
+  width: fit-content;
+  height: fit-content;
+}
+#map-search-button .menu-button-label {
+  margin: 10px;
+}
 .menu-button-child {
 	    width: 32px;
 	    height: 32px;

package/crouton.js

@@ -13314,7 +13314,7 @@ function CroutonLocalization(language) {
 			"no_meetings_for_this_day": "Keine Meetings an diesem Tag.",
 			'css-textalign': '',
 			'css-floatdirection': '',
-			'all': 'All',
+			'all': 'Alle',
 			'menu': 'Menu',
 			'search for meetings': 'Search for meetings',
 			'show meetings near...': 'Meetings in andere Städten',
@@ -14499,7 +14499,7 @@ this["hbs_Crouton"]["templates"]["mapSearch"] = Handlebars.template({"compiler":
         return undefined
     };
 
-  return "<button id=\"map-search-button\" class=\"menu-button\" title=\"Erweiterte Suche\" style=\"width: 95px; height:55px;\">\n    <span class=\"menu-button-label\" style=\"position:initial;\">"
+  return "<button id=\"map-search-button\" class=\"menu-button\" title=\"Erweiterte Suche\">\n    <span class=\"menu-button-label\" style=\"position:initial;\">"
     + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"Search for meetings",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":2,"column":62},"end":{"line":2,"column":95}}}))
     + "</span>\n</button>\n<div id=\"bmltsearch_modal\" class=\"modal\" style=\"display: none;\">\n	<div id=\"bmltsearch_content\" class=\"modal-content\">\n		<span class=\"modal-title\">"
     + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"Search for meetings",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":6,"column":28},"end":{"line":6,"column":61}}}))
@@ -14799,7 +14799,7 @@ var croutonDefaultTemplates = {
 
 	meeting_count_template: [
 		"{{#if this.config.has_meeting_count}}",
-		"<span class='bmlt_tabs_meeting_count'>{{getWord 'meeting_count'}} <span id='bmlt_tabs_meeting_count'>{{this.meetings.meetingCount}}</span></span>",
+		"<span class='bmlt_tabs_meeting_count'>{{getWord 'meeting_count'}} <span id='bmlt_tabs_meeting_count-live'>{{this.meetings.meetingCount}}</span></span>",
 		"{{/if}}"
 	].join('\n'),
 
@@ -15988,7 +15988,6 @@ function Crouton(config) {
 		theme: "jack",                // Allows for setting pre-packaged themes.  Choices are listed here:  https://github.com/bmlt-enabled/crouton/blob/master/croutonjs/dist/templates/themes
 		meeting_data_template: croutonDefaultTemplates.meeting_data_template,
 		metadata_template: croutonDefaultTemplates.metadata_template,
-		marker_contents_template: croutonDefaultTemplates.marker_contents_template,
 		observer_template: croutonDefaultTemplates.observer_template,
 		meeting_count_template: croutonDefaultTemplates.meeting_count_template,
 		meeting_link_template: croutonDefaultTemplates.meeting_link_template,
@@ -15996,7 +15995,6 @@ function Crouton(config) {
 		meetingpage_title_template: croutonDefaultTemplates.meetingpage_title_template,
 		meetingpage_contents_template: croutonDefaultTemplates.meetingpage_contents_template,
 		meetingpage_frame_template: croutonDefaultTemplates.meetingpage_frame_template,
-		marker_contents_template: croutonDefaultTemplates.marker_contents_template,
 		lat: 0,
 		lng: 0,
 		zoom: 10,
@@ -16320,7 +16318,7 @@ function Crouton(config) {
 			showingNow.push(rowId[rowId.length-1]);
 		});
 		showingNow = [...new Set(showingNow)];
-		self.updateMeetingCount(showingNow.length);
+		self.updateMeetingCount(showingNow);
 		self.updateFilters();
 		if (croutonMap) croutonMap.fillMap(showingNow);
 		if (self.config.map_page) {
@@ -16359,7 +16357,7 @@ function Crouton(config) {
 		} else if (self.config.show_map) croutonMap.fillMap();
 		self.filtering = false; 
 		self.updateFilters();
-		self.updateMeetingCount(self.meetingData.length);
+		self.updateMeetingCount();
 		jQuery(".filter-dropdown").val(null).trigger("change");
 		jQuery(".meeting-header").removeClass("hide");
 		jQuery(".bmlt-data-row").removeClass("hide");
@@ -16389,13 +16387,13 @@ function Crouton(config) {
 			dropdown.optionsShowing = dropdown.uniqueData(showing).map((o) => dropdown.optionName(o));
 		});
 	}
-	self.renderStandaloneMap = function (selector, context, callback) {
+	self.renderStandaloneMap = function (selector, context, callback=null, fitBounds=true) {
 		hbs_Crouton['localization'] = self.localization;
 		self.config["hide_byday_headers"] = true;
 		crouton_Handlebars.registerPartial('meetings', hbs_Crouton.templates['meetings']);
 		crouton_Handlebars.registerPartial('bydays', hbs_Crouton.templates['byday']);
 		crouton_Handlebars.registerPartial('formatPopup', hbs_Crouton.templates['formatPopup']);
-		croutonMap.initialize(self.createBmltMapElement(),self.meetingData,context,null,callback);
+		croutonMap.initialize(self.createBmltMapElement(),self.meetingData,context,null,fitBounds,callback);
 	}
 	self.getCurrentLocation = function(callback) {
 		if (navigator.geolocation) {
@@ -16404,7 +16402,7 @@ function Crouton(config) {
 			$('.geo').removeClass("hide").addClass("show").html('<p>Geolocation is not supported by your browser</p>');
 		}
 	};
-	self.renderView = function (selector, context, callback) {
+	self.renderView = function (selector, context, callback, fitBounds) {
 		hbs_Crouton['localization'] = self.localization;
 		crouton_Handlebars.registerPartial('meetings', hbs_Crouton.templates['meetings']);
 		crouton_Handlebars.registerPartial('bydays', hbs_Crouton.templates['byday']);
@@ -16416,8 +16414,45 @@ function Crouton(config) {
 		jQuery(selector).html(template(context));
 		callback();
 	};
-	self.updateMeetingCount = function(meetingCount) {
-		jQuery('#bmlt_tabs_meeting_count').html(meetingCount);
+	self.updateMeetingCount = function(showingNow=null) {
+		self = this;
+		let meetingCount = self.meetingData.length;
+		addLive = function(id) {return id+", "+id+"-live"};
+		if (showingNow !== null) {
+			meetingCount = showingNow.length;
+			addLive = function(id) {return id+"-live"};
+		}
+		jQuery(addLive('#bmlt_tabs_meeting_count')).text(meetingCount);
+		jQuery(addLive('#bmlt_tabs_group_count')).each(function(){
+			var filteredMeetings = self.meetingData;
+			if (showingNow!==null) filteredMeetings = self.meetingData.filter((m) => showingNow.includes(m.id_bigint));
+			var groups = filteredMeetings.map((m)=>m['worldid_mixed'] !== "" ? m['worldid_mixed'] :m['meeting_name']);
+			jQuery(this).text(arrayUnique(groups).length);
+		});
+		jQuery(addLive('#bmlt_tabs_service_body_names')).each(function() {
+			var filteredMeetings = self.meetingData;
+			if (showingNow!==null) filteredMeetings = self.meetingData.filter((m) => showingNow.includes(m.id_bigint));
+			var ids = getUniqueValuesOfKey(filteredMeetings, 'service_body_bigint');
+			var me = this;
+			self.getServiceBodies(ids).then(function (service_bodies) {
+				var n = service_bodies.length;
+				var names = service_bodies.map((m)=>m['name']);
+				names.sort();
+				var ret = "";
+				if (n===1) {
+					ret = names[0];
+				}
+				else {
+					ret = names[0];
+					for (var j = 1; j < n-1; j++) {
+						ret += ', ';
+						ret += names[j];
+					}
+					ret += ' and ' + names[n-1];
+				}
+				jQuery(me).text(ret);
+			});
+		});
 	}
 	self.getServiceBodies = function(service_bodies_id) {
 		var requires_parents = self.config.has_regions;
@@ -16562,9 +16597,6 @@ function Crouton(config) {
 		self.filteredPage();
 	}
 
-	self.isMeetingInTime = function(meeting, dayNow, hour, mins) {
-
-	}
 	self.distance = function(lat1, lon1, lat2, lon2, unit) {
 		if ((lat1 === lat2) && (lon1 === lon2)) {
 			return 0;
@@ -16599,14 +16631,12 @@ function Crouton(config) {
 
 		crouton_Handlebars.registerPartial("meetingDataTemplate", self.config['meeting_data_template']);
 		crouton_Handlebars.registerPartial("metaDataTemplate", self.config['metadata_template']);
-		crouton_Handlebars.registerPartial("popupTemplate", self.config['marker_contents_template']);
 		crouton_Handlebars.registerPartial("observerTemplate", self.config['observer_template']);
 		crouton_Handlebars.registerPartial("meetingpageTitleTemplate", self.config['meetingpage_title_template']);
 		crouton_Handlebars.registerPartial("meetingpageContentsTemplate", self.config['meetingpage_contents_template']);
 		crouton_Handlebars.registerPartial("meetingCountTemplate", self.config['meeting_count_template']);
 		crouton_Handlebars.registerPartial("meetingLink", self.config['meeting_link_template']);
 		crouton_Handlebars.registerPartial("meetingModal", self.config['meeting_modal_template']);
-		crouton_Handlebars.registerPartial("markerContentsTemplate", self.config['marker_contents_template']);
 
 		for (var m = 0; m < meetingData.length; m++) {
 			meetingData[m]['formatted_comments'] = meetingData[m]['comments'];
@@ -16813,52 +16843,6 @@ Crouton.prototype.reset = function() {
 	jQuery("#" + self.config["placeholder_id"]).html("");
 };
 
-Crouton.prototype.meetingCount = function(callback) {
-	var self = this;
-	self.lock(function() {
-		callback(self.meetingData.length);
-	});
-};
-
-Crouton.prototype.groupCount = function(callback) {
-	var self = this;
-	self.lock(function() {
-		var groups = [];
-		for (var i = 0; i < self.meetingData.length; i++) {
-			groups.push(self.meetingData[i]['worldid_mixed'] !== "" ? self.meetingData[i]['worldid_mixed'] : self.meetingData[i]['meeting_name']);
-		}
-		callback(arrayUnique(groups).length);
-	});
-};
-
-Crouton.prototype.serviceBodyNames = function(callback) {
-	var self = this;
-	self.lock(function() {
-		var ids = getUniqueValuesOfKey(self.meetingData, 'service_body_bigint');
-		self.getServiceBodies(ids).then(function (service_bodies) {
-			var n = service_bodies.length;
-			var names = [];
-			for (var i = 0; i < n; i++) {
-				names.push(service_bodies[i]['name']);
-			}
-			names.sort();
-			if (n===1) {
-				callback(names[0]);
-			}
-			else if (n===2) {
-				callback(names[0] + ' and ' + names[1]);
-			}
-			else {
-				var str = '';
-				for (var j = 0; j < n-1; j++) {
-					str += names[j];
-					str += ', ';
-				}
-				callback(str + ' and ' + names[n-1]);
-			}
-		});
-	});
-};
 Crouton.prototype.doFilters = function() {
 	return this.filteredPage();
 }
@@ -16958,7 +16942,7 @@ Crouton.prototype.searchMap = function() {
 			"meetingData": []
 		},
 		"dropdownData": [],
-		"location": {'latitude':0,'longitude':0,'zoom':10}
+		"location": {'latitude':0,'longitude':0,'zoom':10}  // TODO: Where is this used?
 	});
 }
 Crouton.prototype.render = function(doMeetingMap = false) {
@@ -17268,16 +17252,16 @@ Crouton.prototype.render = function(doMeetingMap = false) {
 						croutonMap.initialize(self.createBmltMapElement(), self.meetingData);
 						jQuery("#bmlt-map").removeClass("hide");
 					}
-					if (self.config['map_page']) {
+					if (self.config['map_page'] && !doMeetingMap) {
 						croutonMap.initialize('byfield_embeddedMapPage', self.meetingData);
 					}
 					if (self.config['refresh_map']) {
-						croutonMap.refreshMeetings(self.meetingData, 0, '', true);
+						croutonMap.refreshMeetings(self.meetingData, true, true);
 					}
 					if (self.config['on_complete'] != null && isFunction(self.config['on_complete'])) {
 						self.config['on_complete']();
 					}
-				});
+				}, !doMeetingMap);
 			});
 		});
 };
@@ -17693,6 +17677,7 @@ function MeetingMap(inConfig) {
 	const config = inConfig;
 	if (!config.maxZoom) config.maxZoom = 17;
 	if (!config.minZoom) config.minZoom = 6;
+	if (!config.marker_contents_template) config.marker_contents_template = croutonDefaultTemplates.marker_contents_template;
 	var gAllMeetings = null;
 	var gMeetingIdsFromCrouton = null;
 	var loadedCallbackFunction = null;
@@ -17710,6 +17695,7 @@ function MeetingMap(inConfig) {
 
 	function loadMap(inDiv, menuContext, handlebarMapOptions=null,cb=null) {
 		if (inDiv) {
+			crouton_Handlebars.registerPartial("markerContentsTemplate", config['marker_contents_template']);
 			gInDiv = inDiv;
 			createThrobber(inDiv);
 			if (!config.map_search) showThrobber();
@@ -17843,15 +17829,15 @@ function MeetingMap(inConfig) {
 		return controlDiv;
 	}
 
-	function loadFromCrouton(inDiv_id, meetings_responseObject, menuContext = null, handlebarMapOptions = null, callback) {
+	function loadFromCrouton(inDiv_id, meetings_responseObject, menuContext = null, handlebarMapOptions = null, fitBounds = true, callback) {
 		if (!gDelegate.isApiLoaded()) {
-			preloadApiLoadedCallback(loadFromCrouton, [inDiv_id, meetings_responseObject, menuContext, handlebarMapOptions, callback]);
+			preloadApiLoadedCallback(loadFromCrouton, [inDiv_id, meetings_responseObject, menuContext, handlebarMapOptions, fitBounds, callback]);
 			gDelegate.loadApi();
 			return;
 		}
 		let inDiv = document.getElementById(inDiv_id);
 		loadMap(inDiv, menuContext, handlebarMapOptions,callback);
-		loadAllMeetings(meetings_responseObject, true);
+		loadAllMeetings(meetings_responseObject, fitBounds, true);
 	};
 	function loadPopupMap(inDiv_id, meeting, handlebarMapOptions = null) {
 		if (!gDelegate.isApiLoaded()) {
@@ -17932,7 +17918,7 @@ function MeetingMap(inConfig) {
 		showThrobber();
 		crouton.searchByCoordinates(latlng.lat, latlng.lng, config.map_search.width);
 	}
-	function loadAllMeetings(meetings_responseObject, fitAll=false) {
+	function loadAllMeetings(meetings_responseObject, fitBounds=true, fitAll=false) {
 		if (meetings_responseObject === null && config.map_search) {
 			if (config.map_search.auto) nearMeSearch();
 			else if (config.map_search.coordinates_search) {
@@ -17945,8 +17931,10 @@ function MeetingMap(inConfig) {
 			return;
 		}
 		gAllMeetings = meetings_responseObject.filter(m => m.venue_type != 2);
-		const lat_lngs = gAllMeetings.reduce(function(a,m) {a.push([m.latitude, m.longitude]); return a;},[]);
-		gDelegate.fitBounds(lat_lngs);
+		if (fitBounds) {
+			const lat_lngs = gAllMeetings.reduce(function(a,m) {a.push([m.latitude, m.longitude]); return a;},[]);
+			gDelegate.fitBounds(lat_lngs);
+		}
 		searchResponseCallback();
 		hideThrobber();
 		if (config.centerMe) {