@bmlt-enabled/croutonjs 4.1.3 → 4.1.5

package/crouton.js

@@ -11413,6 +11413,8 @@ function CroutonLocalization(language) {
 			"address_lookup_fail": "Die Adresse konnte nicht gefunden werden. Bitte versuchen Sie es erneut.",
 			"contact": "Kontakt",
 			"distance": "Entfernung",
+			"all meetings": "Alle Meetings",
+			'upcoming meetings': "Nächste 24 Stunden",
 		},
 		'el-GR': {
 			"days_of_the_week": ["", "Κυριακή", "Δευτέρα", "Τρίτη", "Τετάρτη", "Πέμπτη", "Παρασκευή", "Σάββατο"],
@@ -11503,6 +11505,8 @@ function CroutonLocalization(language) {
 			"meets virtually": "Διαδικτυακή ομάδα",
 			"meets in person": "Φυσική ομάδα",
 			"meets virtually and in person": "Διαδικτυακή και φυσική ομάδα",
+			"all meetings": "Όλες οι ομάδες",
+			"upcoming meetings": "Προσεχείς ομάδες",
 		},
 		"en-AU": {
 			"days_of_the_week": ["", "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
@@ -11869,6 +11873,8 @@ function CroutonLocalization(language) {
 			"address": "Address",
 			"comments": "Comments",
 			"more info": "More Info",
+			"all meetings": "All Meetings",
+			'upcoming meetings': "Upcoming Meetings",
 		},
 		"es-US": {
 			"days_of_the_week": ["", "Domingo", "Lunes", "Martes", "Miércoles", "Jueves", "Viernes", "Sábado"],
@@ -15283,7 +15289,7 @@ function Crouton(config) {
 	self.currentView = "weekday";
 	self.distanceTabAllowed = false;
 	self.config = {
-		version: '4.1.3',            // CroutonJS version for debugging
+		version: '4.1.5',            // 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
@@ -15531,10 +15537,10 @@ function Crouton(config) {
 			}
 		} else if (viewName=='map') {
 			self.mapView();
-		} else if (jQuery('#groupingButton_'+viewName.toUpperCase()).length == 0) {
-			self.groupedView(self.config.grouping_buttons.find((bf) => bf.title.toLowerCase() === viewName).field);
+		} else if (jQuery('#groupingButton_'+viewName).length == 0) {
+			self.groupedView(self.config.grouping_buttons.find((bf) => bf.title.toLowerCase() === viewName.toLowerCase()).field);
 		} else {
-			self.groupedView(viewName.toUpperCase());
+			self.groupedView(viewName);
 		}
 	};
 
@@ -16066,7 +16072,7 @@ function Crouton(config) {
 		});
 		return groups;
 	}
-	Crouton.prototype.updateDistances = function() {
+	Crouton.prototype.updateDistances = function(initial=false) {
 		const self = this;
 		var knt = 0;
 		jQuery('.meeting-distance').each(function(index) {
@@ -16100,8 +16106,12 @@ function Crouton(config) {
 			});
 		}
 		const sorted = parent.children().sort(function (a, b) {
-			const distanceA =parseFloat( jQuery(a).data('distance'));
-			const distanceB =parseFloat( jQuery(b).data('distance'));
+			const idA =parseFloat( jQuery(a).data('meetingid').replace("meeting-data-row-", ""));
+			const idB =parseFloat( jQuery(b).data('meetingid').replace("meeting-data-row-", ""));
+			const dataA = self.meetingData.find((m) => m.id_bigint==idA);
+			const dataB = self.meetingData.find((m) => m.id_bigint==idB);
+			const distanceA = dataA ? parseFloat(dataA['distance_in_km']) : Number.POSITIVE_INFINITY;
+			const distanceB = dataB ? parseFloat(dataB['distance_in_km']) : Number.POSITIVE_INFINITY;
       		return (distanceA < distanceB) ? -1 : (distanceA > distanceB) ? 1 : 0;
    		});
 		parent.html(sorted);
@@ -16113,6 +16123,7 @@ function Crouton(config) {
 		if (knt > 0) {
 			jQuery('#groupingButton_distance_in_km').removeClass('hide');
 			self.distanceTabAllowed = true;
+			if (initial && self.config.view_by === "distance") self.groupedView("distance_in_km");
 		}
 	}
 	self.registerPartial = function(name, template) {
@@ -16720,7 +16731,7 @@ Crouton.prototype.render = function(doMeetingMap = false, fitBounds=true) {
 					});
 
 					jQuery(".groupingButtonLogic").on('click', function (e) {
-						self.showView(e.target.attributes['data-field'].value.toLowerCase());
+						self.showView(e.target.attributes['data-field'].value);
 					});
 					jQuery('#groupingButton_embeddedMapPage').on('click', function (e) {
 						self.showView('map')
@@ -17318,19 +17329,19 @@ function MeetingMap(inConfig) {
 			 </label>
 		 </div>
 	</div>`;
-		rules = [`.onoffswitch-inner:before {
-		content: "__text__";
+		let rules = `.onoffswitch-inner:before {
+		content: "__text1__";
 		padding-left: 10px;
 		background-color: #2d5c88; color: #FFFFFF;
-		}`,
-		`.onoffswitch-inner:after {
-		content: "__text__";
+		}
+		.onoffswitch-inner:after {
+		content: "__text2__";
 		padding-left: 30px;
 		background-color: #EEEEEE; color: #2d5c88;
 		text-align: left;
-		}`];
-		rules[0] = rules[0].replace("__text__", crouton.localization.getWord("Upcoming Meetings"));
-		rules[1] = rules[1].replace("__text__", crouton.localization.getWord("All Meetings"));
+		}`
+			.replace("__text1__", crouton.localization.getWord("Upcoming Meetings"))
+			.replace("__text2__", crouton.localization.getWord("All Meetings"));
 		var controlDiv = document.createElement('div');
 		controlDiv.innerHTML = toggleSrc;
 		controlDiv.querySelector(".onoffswitch").addEventListener('click', function (event) {
@@ -17340,8 +17351,9 @@ function MeetingMap(inConfig) {
 			crouton.filterNext24(next24status);
 			fitDuringFilter = true;
 		});
-		document.styleSheets[0].insertRule(rules[0]);
-		document.styleSheets[0].insertRule(rules[1]);
+		let style = document.createElement('style');
+    	style.innerHTML = rules;
+   		document.head.appendChild(style);
 		return controlDiv;
 	}
 	function createMenuButton(menuContext) {
@@ -17540,7 +17552,7 @@ function MeetingMap(inConfig) {
 							filterVisible(isFilterVisible());
 						});
 						gSearchPoint = {"lat": position.coords.latitude, "lng": position.coords.longitude};
-						crouton.updateDistances();
+						crouton.updateDistances(true);
 					},
 					showGeocodingDialog
 				);
@@ -18327,6 +18339,7 @@ function openMarker(id) {
 	jQuery("#meeting-data-row-" + id + " > td").addClass("rowHighlight");
 }
 function addControl(div,pos,cb) {
+	if (!div) return;
 	if (!gMainMap) {
         gDiv.appendChild(div);
         return;