@bmlt-enabled/croutonjs 4.3.2 → 4.3.4

package/crouton.nojquery.js

@@ -12979,7 +12979,7 @@ function CroutonHandlebarsExtensions() {
 		crouton_Handlebars.registerPartial('header', hbs_Crouton.templates['header']);
 		crouton_Handlebars.registerPartial('byfields', hbs_Crouton.templates['byfield']);
 		crouton_Handlebars.registerPartial('formatPopup', hbs_Crouton.templates['formatPopup']);
-		crouton_Handlebars.registerPartial('meetingModal', "<a tabindex='0' href='#' onclick='crouton.meetingModal({{this.id_bigint}})'><span class='glyphicon glyphicon-search' aria-hidden='true'></span>{{this.meeting_name}}</a>");
+		crouton_Handlebars.registerPartial('meetingModal', "<a tabindex='0' onclick='crouton.meetingModal({{this.id_bigint}})'><span class='glyphicon glyphicon-search' aria-hidden='true'></span>{{this.meeting_name}}</a>");
 		crouton_Handlebars.registerPartial('meetingLink', `
 			{{#if this.meeting_details_url}}
 				<a href='{{{this.meeting_details_url}}}'><span class='glyphicon glyphicon-search' aria-hidden='true'></span>{{this.meeting_name}}</a>
@@ -13385,7 +13385,7 @@ this["hbs_Crouton"]["templates"]["group3ColumnRow"] = Handlebars.template({"0":f
 
   return "<td class=\"bmlt-column1\" "
     + ((stack1 = (lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"css-textAlign",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":1,"column":25},"end":{"line":1,"column":54}}})) != null ? stack1 : "")
-    + ">\n			<div class='meeting-name'>\n				<a tabindex='0' href='#' onclick='crouton.meetingModal("
+    + ">\n			<div class='meeting-name'>\n				<a tabindex='0' onclick='crouton.meetingModal("
     + alias4(alias3((depth0 != null ? lookupProperty(depth0,"id_bigint") : depth0), depth0))
     + ")'><span class='glyphicon glyphicon-search' aria-hidden='true'></span>"
     + alias4(alias3((depth0 != null ? lookupProperty(depth0,"meeting_name") : depth0), depth0))
@@ -13619,10 +13619,10 @@ this["hbs_Crouton"]["templates"]["header"] = Handlebars.template({"0":function(c
         return undefined
     };
 
-  return "                <li><a href=\"#tab"
+  return "                <li><a href=\"./#tab"
     + alias1(container.lambda(depth0, depth0))
     + "\" data-toggle=\"tab\">"
-    + alias1((lookupProperty(helpers,"getDayOfTheWeek")||(depth0 && lookupProperty(depth0,"getDayOfTheWeek"))||container.hooks.helperMissing).call(depth0 != null ? depth0 : (container.nullContext || {}),depth0,{"name":"getDayOfTheWeek","hash":{},"data":data,"loc":{"start":{"line":38,"column":61},"end":{"line":38,"column":85}}}))
+    + alias1((lookupProperty(helpers,"getDayOfTheWeek")||(depth0 && lookupProperty(depth0,"getDayOfTheWeek"))||container.hooks.helperMissing).call(depth0 != null ? depth0 : (container.nullContext || {}),depth0,{"name":"getDayOfTheWeek","hash":{},"data":data,"loc":{"start":{"line":38,"column":63},"end":{"line":38,"column":87}}}))
     + "</a></li>\n";
 },"compiler":[8,">= 4.3.0"],"main":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1, alias1=depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty = container.lookupProperty || function(parent, propertyName) {
@@ -14089,7 +14089,7 @@ this["hbs_Crouton"]["templates"]["meetingDetailsButton"] = Handlebars.template({
 
   return "            <div>\n		        <a onclick='crouton.meetingModal("
     + alias1(container.lambda((depth0 != null ? lookupProperty(depth0,"id_bigint") : depth0), depth0))
-    + ")' tabindex='0' href='#' class='map-button btn btn-primary btn-xs'>\n				    <span class='glyphicon glyphicon-search' aria-hidden='true'></span>\n					"
+    + ")' tabindex='0' class='map-button btn btn-primary btn-xs'>\n				    <span class='glyphicon glyphicon-search' aria-hidden='true'></span>\n					"
     + alias1((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||container.hooks.helperMissing).call(depth0 != null ? depth0 : (container.nullContext || {}),"meeting details",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":4,"column":5},"end":{"line":4,"column":34}}}))
     + "\n				</a>\n		    </div>\n";
 },"useData":true});
@@ -15465,7 +15465,7 @@ function Crouton(config) {
 	self.distanceTabAllowed = false;
 	self.favoritesOn = false;
 	self.config = {
-		version: '4.3.2',             // CroutonJS version for debugging
+		version: '4.3.4',             // CroutonJS version for debugging
 		on_complete: null,            // Javascript function to callback when data querying is completed.
 		root_server: null,			  // The root server to use.
 		placeholder_id: "bmlt-tabs",  // The DOM id that will be used for rendering
@@ -15723,7 +15723,7 @@ function Crouton(config) {
 	self.dayTabFromId = function(id) {
 		const day_id = self.meetingData.find((m)=>m.id_bigint == id).weekday_tinyint;
 		self.hideAllPages();
-		jQuery('.nav-tabs a[href="#tab' + day_id + '"]').tab('show');
+		jQuery('.nav-tabs a[href="./#tab' + day_id + '"]').tab('show');
 		jQuery("#" + day_id).removeClass("hide").addClass("show");
 	};
 	/**
@@ -17056,7 +17056,7 @@ Crouton.prototype.render = function(doMeetingMap = false, fitBounds=true) {
 						const d = new Date();
 						let n = d.getDay();
 						n++;
-						jQuery('.nav-tabs a[href="#tab' + n + '"]').tab('show');
+						jQuery('.nav-tabs a[href="./#tab' + n + '"]').tab('show');
 						jQuery('#tab' + n).show();
 					}
 
@@ -17744,7 +17744,7 @@ function MeetingMap(inConfig) {
 				filterVisible(false);
 				gSearchPoint = {"lat": position.lat, "lng": position.lng};
 				crouton.updateDistances();
-				const locationSearchResult = gDelegate.getZoomAdjustedBounds(gSearchPoint, filterMeetingsAndBounds, config.locationSearchZoom ?? 12);
+				const locationSearchResult = gDelegate.getZoomAdjustedBounds(gSearchPoint, filterMeetingsAndBounds, config.locationSearchZoom ?? 12, findClosestMeetingLatLng(gSearchPoint));
 				gDelegate.flyToFixedZoom(position, locationSearchResult.zoom, filterVisible);
 				filterVisible(true);
 				setLocationSearchButtonLabel(crouton.localization.getWord('closest meetings'));
@@ -17908,7 +17908,7 @@ function MeetingMap(inConfig) {
 			const centerAndBounds = gDelegate.getGeocodeCenterAndBounds(resp, i);
 			if (!centerAndBounds) return;
 			const zoom = calcZoomThatContainsBoundingBox(centerAndBounds);
-			const locationSearchResult = gDelegate.getZoomAdjustedBounds(gSearchPoint, filterMeetingsAndBounds, zoom);
+			const locationSearchResult = gDelegate.getZoomAdjustedBounds(gSearchPoint, filterMeetingsAndBounds, zoom, findClosestMeetingLatLng(gSearchPoint));
 			gDelegate.flyToFixedZoom(gSearchPoint, locationSearchResult.zoom, filterVisible);
 			searchResponseCallback();
 		})
@@ -17972,6 +17972,16 @@ function MeetingMap(inConfig) {
 	function locationSearchGeocodeInitial(resp) {
 		locationSearchGeocode(resp, true);
 	}
+	function findClosestMeetingLatLng(center) {
+		return filterMeetings(gAllMeetings).reduce((closest, meeting) => {
+			const meetingLocation = {lat: meeting.latitude, lng: meeting.longitude};
+			const distance = getDistance(center, meetingLocation);
+			if (distance < closest.distance) {
+				return {meetingLocation: meetingLocation, distance: distance};
+			}
+			return closest;
+		}, {meetingLocation: null, distance: Infinity}).meetingLocation;
+	}
 	function locationSearchGeocode(resp, initial=false) {
 		chooseResponse('bmlt_location_search_modal', resp, function(resp, i) {
 			closeModalWindow(gLocationSearchModal);
@@ -17980,7 +17990,8 @@ function MeetingMap(inConfig) {
 			let center = centerAndBounds.center;
 			filterVisible(false);
 			let zoom = calcZoomThatContainsBoundingBox(centerAndBounds);
-			gLocationSearchResult = gDelegate.getZoomAdjustedBounds(center, filterMeetingsAndBounds, zoom);
+
+			gLocationSearchResult = gDelegate.getZoomAdjustedBounds(center, filterMeetingsAndBounds, zoom, findClosestMeetingLatLng(center));
 			gSearchPoint = {"lat": gLocationSearchResult.center.lat, "lng": gLocationSearchResult.center.lng};
 			filterVisible(true, gLocationSearchResult.bounds);
 			crouton.updateDistances(initial);
@@ -18045,13 +18056,13 @@ function MeetingMap(inConfig) {
 			retrieveGeolocation().then(function(coords) {
 				filterVisible(false);
 				if (isMapVisible() || !makeFilterVisible) {
-					const locationSearchResult = gDelegate.getZoomAdjustedBounds(coords, filterMeetingsAndBounds, config.locationSearchZoom ?? 12);
+					const locationSearchResult = gDelegate.getZoomAdjustedBounds(coords, filterMeetingsAndBounds, config.locationSearchZoom ?? 12, findClosestMeetingLatLng(coords));
 					gDelegate.flyToFixedZoom(coords, locationSearchResult.zoom, () => {
 						filterVisible(makeFilterVisible);
 						if (makeFilterVisible) setLocationSearchButtonLabel(crouton.localization.getWord('closest meetings'));
 					});
 				} else {
-					gLocationSearchResult = gDelegate.getZoomAdjustedBounds(coords, filterMeetingsAndBounds, config.locationSearchZoom ?? 12);
+					gLocationSearchResult = gDelegate.getZoomAdjustedBounds(coords, filterMeetingsAndBounds, config.locationSearchZoom ?? 12, findClosestMeetingLatLng(coords));
 					filterVisible(true, gLocationSearchResult.bounds);
 					setLocationSearchButtonLabel(crouton.localization.getWord('closest meetings'));
 				}