@bmlt-enabled/croutonjs 3.21.1 → 3.21.2

package/crouton-gmaps.js

@@ -14318,8 +14318,8 @@ this["hbs_Crouton"]["templates"]["header"] = Handlebars.template({"1":function(c
     };
 
   return ((stack1 = lookupProperty(helpers,"if").call(alias1,((stack1 = (depth0 != null ? lookupProperty(depth0,"config") : depth0)) != null ? lookupProperty(stack1,"include_weekday_button") : stack1),{"name":"if","hash":{},"fn":container.program(2, data, 0, blockParams, depths),"inverse":container.noop,"data":data,"loc":{"start":{"line":3,"column":4},"end":{"line":5,"column":11}}})) != null ? stack1 : "")
-    + ((stack1 = lookupProperty(helpers,"each").call(alias1,((stack1 = (depth0 != null ? lookupProperty(depth0,"config") : depth0)) != null ? lookupProperty(stack1,"button_filters") : stack1),{"name":"each","hash":{},"fn":container.program(4, data, 0, blockParams, depths),"inverse":container.noop,"data":data,"loc":{"start":{"line":6,"column":4},"end":{"line":8,"column":13}}})) != null ? stack1 : "")
-    + ((stack1 = lookupProperty(helpers,"each").call(alias1,((stack1 = (depth0 != null ? lookupProperty(depth0,"config") : depth0)) != null ? lookupProperty(stack1,"button_format_filters") : stack1),{"name":"each","hash":{},"fn":container.program(6, data, 0, blockParams, depths),"inverse":container.noop,"data":data,"loc":{"start":{"line":9,"column":4},"end":{"line":11,"column":13}}})) != null ? stack1 : "")
+    + ((stack1 = lookupProperty(helpers,"each").call(alias1,((stack1 = (depth0 != null ? lookupProperty(depth0,"config") : depth0)) != null ? lookupProperty(stack1,"grouping_buttons") : stack1),{"name":"each","hash":{},"fn":container.program(4, data, 0, blockParams, depths),"inverse":container.noop,"data":data,"loc":{"start":{"line":6,"column":4},"end":{"line":8,"column":13}}})) != null ? stack1 : "")
+    + ((stack1 = lookupProperty(helpers,"each").call(alias1,((stack1 = (depth0 != null ? lookupProperty(depth0,"config") : depth0)) != null ? lookupProperty(stack1,"formattype_grouping_buttons") : stack1),{"name":"each","hash":{},"fn":container.program(6, data, 0, blockParams, depths),"inverse":container.noop,"data":data,"loc":{"start":{"line":9,"column":4},"end":{"line":11,"column":13}}})) != null ? stack1 : "")
     + ((stack1 = lookupProperty(helpers,"if").call(alias1,((stack1 = (depth0 != null ? lookupProperty(depth0,"config") : depth0)) != null ? lookupProperty(stack1,"map_page") : stack1),{"name":"if","hash":{},"fn":container.program(8, data, 0, blockParams, depths),"inverse":container.noop,"data":data,"loc":{"start":{"line":12,"column":4},"end":{"line":14,"column":11}}})) != null ? stack1 : "")
     + "\n"
     + ((stack1 = lookupProperty(helpers,"each").call(alias1,(depth0 != null ? lookupProperty(depth0,"dropdownData") : depth0),{"name":"each","hash":{},"fn":container.program(10, data, 0, blockParams, depths),"inverse":container.noop,"data":data,"loc":{"start":{"line":16,"column":4},"end":{"line":25,"column":13}}})) != null ? stack1 : "")
@@ -14343,12 +14343,12 @@ this["hbs_Crouton"]["templates"]["header"] = Handlebars.template({"1":function(c
         return undefined
     };
 
-  return "        <div class=\"bmlt-button-container\"><a id=\"filterButton_"
+  return "        <div class=\"bmlt-button-container\"><a id=\"groupingButton_"
     + alias2(alias1((depth0 != null ? lookupProperty(depth0,"field") : depth0), depth0))
     + "\" tabindex=0 data-field=\""
     + alias2(alias1((depth0 != null ? lookupProperty(depth0,"title") : depth0), depth0))
-    + "\" class=\"filterButton filterButtonLogic btn btn-primary btn-sm\">"
-    + alias2((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||container.hooks.helperMissing).call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? lookupProperty(depth0,"title") : depth0),{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":7,"column":180},"end":{"line":7,"column":202}}}))
+    + "\" class=\"groupingButton groupingButtonLogic btn btn-primary btn-sm\">"
+    + alias2((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||container.hooks.helperMissing).call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? lookupProperty(depth0,"title") : depth0),{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":7,"column":186},"end":{"line":7,"column":208}}}))
     + "</a></div>\n";
 },"6":function(container,depth0,helpers,partials,data) {
     var alias1=container.lambda, alias2=container.escapeExpression, lookupProperty = container.lookupProperty || function(parent, propertyName) {
@@ -14358,11 +14358,11 @@ this["hbs_Crouton"]["templates"]["header"] = Handlebars.template({"1":function(c
         return undefined
     };
 
-  return "        <div class=\"bmlt-button-container\"><a id=\"filterButton_"
+  return "        <div class=\"bmlt-button-container\"><a id=\"groupingButton_"
     + alias2(alias1((depth0 != null ? lookupProperty(depth0,"field") : depth0), depth0))
     + "\"tabindex=0 data-field=\""
     + alias2(alias1((depth0 != null ? lookupProperty(depth0,"field") : depth0), depth0))
-    + "\" class=\"filterButton filterButtonLogic btn btn-primary btn-sm\">"
+    + "\" class=\"groupingButton groupingButtonLogic btn btn-primary btn-sm\">"
     + alias2(alias1((depth0 != null ? lookupProperty(depth0,"title") : depth0), depth0))
     + "</a></div>\n";
 },"8":function(container,depth0,helpers,partials,data) {
@@ -14373,8 +14373,8 @@ this["hbs_Crouton"]["templates"]["header"] = Handlebars.template({"1":function(c
         return undefined
     };
 
-  return "        <div class=\"bmlt-button-container\"><a id=\"filterButton_embeddedMapPage\" tabindex=0 data-field=\"embeddedMapPage\" class=\"filterButton btn btn-primary btn-sm\">"
-    + container.escapeExpression((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||container.hooks.helperMissing).call(depth0 != null ? depth0 : (container.nullContext || {}),"map",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":13,"column":164},"end":{"line":13,"column":181}}}))
+  return "        <div class=\"bmlt-button-container\"><a id=\"groupingButton_embeddedMapPage\" tabindex=0 data-field=\"embeddedMapPage\" class=\"groupingButton btn btn-primary btn-sm\">"
+    + container.escapeExpression((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||container.hooks.helperMissing).call(depth0 != null ? depth0 : (container.nullContext || {}),"map",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":13,"column":168},"end":{"line":13,"column":185}}}))
     + "</a></div>\n";
 },"10":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1, helper, alias1=container.escapeExpression, alias2=depth0 != null ? depth0 : (container.nullContext || {}), alias3=container.hooks.helperMissing, alias4="function", lookupProperty = container.lookupProperty || function(parent, propertyName) {
@@ -14527,8 +14527,8 @@ this["hbs_Crouton"]["templates"]["main"] = Handlebars.template({"1":function(con
     + " hide\">\n"
     + ((stack1 = container.invokePartial(lookupProperty(partials,"header"),depth0,{"name":"header","data":data,"indent":"        ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "")
     + "    </div>\n"
-    + ((stack1 = lookupProperty(helpers,"each").call(alias1,((stack1 = (depth0 != null ? lookupProperty(depth0,"meetings") : depth0)) != null ? lookupProperty(stack1,"buttonFilters") : stack1),{"name":"each","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data,"loc":{"start":{"line":5,"column":1},"end":{"line":9,"column":10}}})) != null ? stack1 : "")
-    + ((stack1 = lookupProperty(helpers,"each").call(alias1,((stack1 = (depth0 != null ? lookupProperty(depth0,"meetings") : depth0)) != null ? lookupProperty(stack1,"buttonFormatFilters") : stack1),{"name":"each","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data,"loc":{"start":{"line":10,"column":4},"end":{"line":14,"column":10}}})) != null ? stack1 : "")
+    + ((stack1 = lookupProperty(helpers,"each").call(alias1,((stack1 = (depth0 != null ? lookupProperty(depth0,"meetings") : depth0)) != null ? lookupProperty(stack1,"groupingButtons") : stack1),{"name":"each","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data,"loc":{"start":{"line":5,"column":1},"end":{"line":9,"column":10}}})) != null ? stack1 : "")
+    + ((stack1 = lookupProperty(helpers,"each").call(alias1,((stack1 = (depth0 != null ? lookupProperty(depth0,"meetings") : depth0)) != null ? lookupProperty(stack1,"formattypeGroupingButtons") : stack1),{"name":"each","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data,"loc":{"start":{"line":10,"column":4},"end":{"line":14,"column":10}}})) != null ? stack1 : "")
     + ((stack1 = lookupProperty(helpers,"if").call(alias1,((stack1 = (depth0 != null ? lookupProperty(depth0,"config") : depth0)) != null ? lookupProperty(stack1,"map_page") : stack1),{"name":"if","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data,"loc":{"start":{"line":15,"column":4},"end":{"line":18,"column":11}}})) != null ? stack1 : "")
     + "    <div id=\"byday\" class=\"bmlt-page "
     + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"css-direction",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":19,"column":37},"end":{"line":19,"column":64}}}))
@@ -15021,7 +15021,7 @@ var croutonDefaultTemplates = {
 	meetingpage_frame_template: `
 	<div id="meeting_modal" class="modal bootstrap-bmlt" style="display: none;" tabindex="-1" >
 	<div class="modal-content">
-        <span class="modal-title">{{getWord "Meeting Details"}}</span><span id="close_meeting_details" class="modal-close" style="position: absolute;right: 5px;top:10px;">×</span>
+        <span class="modal-title">{{getWord "Meeting Details"}}</span><span id="close_meeting_details" class="modal-close" style="position: absolute;right: 5px;top:10px;">x</span>
 		<table id="meeting-details-table" class="bmlt-table  {{getWord 'css-direction'}} table table-striped table-hover table-bordered tablesaw tablesaw-stack meeting-details">
 			<thead>
         		<th id="meeting-details-title" colspan="2">
@@ -16134,25 +16134,6 @@ crouton_Handlebars.registerHelper("enrich", () => '');
 crouton_Handlebars.registerHelper('selectFormatPopup', () => "formatPopup");
 crouton_Handlebars.registerHelper('selectObserver', () => "observerTemplate");
 
-const retrieveGeolocation = () => {
-	return new Promise((resolve, reject) => {
-		if (window.storedGeolocation) {
-			resolve(window.storedGeolocation);
-		} else if (navigator.geolocation) {
-			navigator.geolocation.getCurrentPosition((position) => {
-				window.storedGeolocation = {
-					latitude: position.coords.latitude,
-					longitude: position.coords.longitude
-				};
-				resolve(window.storedGeolocation);
-			}, (error) => {
-				reject(new Error('Error getting geolocation: ' + error.message));
-			});
-		} else {
-			reject(new Error('Geolocation is not supported by this browser.'));
-		}
-	});
-};
 
 function Crouton(config) {
 	var self = this;
@@ -16160,7 +16141,6 @@ function Crouton(config) {
 	self.filtering = false;
 	self.masterFormatCodes = [];
 	self.currentView = "weekday";
-	self.max_filters = 10;  // TODO: needs to be refactored so that dropdowns are treated dynamically
 	self.config = {
 		on_complete: null,            // Javascript function to callback when data querying is completed.
 		root_server: null,			  // The root server to use.
@@ -16174,11 +16154,11 @@ function Crouton(config) {
 		header: true,                 // Shows the dropdowns and buttons
 		include_weekday_button: true, // Shows the weekday button
 		int_include_unpublished: 0,	  // Includes unpublished meeting
-		button_filters: [
+		grouping_buttons: [
 			{'title': 'City', 'field': 'location_municipality'},
 			{'title': 'Distance', 'field': 'distance_in_km'},
 		],
-		button_format_filters: [],
+		formattype_grouping_buttons: [],
 		default_filter_dropdown: "",  // Sets the default format for the dropdowns, the names will match the `has_` fields dropdowns without `has_.  Example: `formats=closed`.
 		show_map: "embed",            // Shows the map with pins
 		map_search: null, 			  // Start search with map click (ex {"latitude":x,"longitude":y,"width":-10,"zoom":10}
@@ -16200,7 +16180,7 @@ function Crouton(config) {
 		recurse_service_bodies: false,// Recurses service bodies when making service bodies request
 		service_body: [],             // Array of service bodies to return data for.
 		formats: '',		  		  // Return only meetings with these formats (format shared-id, not key-string)
-		venue_types: '',			  // Return only meetings with this venue type (1, 2 or 3)
+		venue_types: [],			  // Return only meetings with this venue type (1, 2 or 3)
 		strict_datafields: true,	  // Only get the datafields that are mentioned in the templates
 		meeting_details_href: '',	  // Link to the meeting details page
 		virtual_meeting_details_href: '', // Link to the virtual meeting details page
@@ -16213,7 +16193,7 @@ function Crouton(config) {
 		custom_query: null,			  // Enables overriding the services related queries for a custom one
 		sort_keys: "start_time",	  // Controls sort keys on the query
 		int_start_day_id: 1,          // Controls the first day of the week sequence.  Sunday is 1.
-		view_by: "weekday",           // TODO: replace with using the first choice in button_filters as the default view_by.
+		view_by: "weekday",           // TODO: replace with using the first choice in grouping_buttons as the default view_by.
 		show_qrcode: false,  		  // Determines whether or not to show the QR code for virtual / phone meetings if they exist.
 		force_rootserver_in_querystring: true, // Set to false to shorten generated meeting detail query strings
 		force_timeformat_in_querystring: true, // Set to false to shorten generated meeting detail query strings
@@ -16397,6 +16377,9 @@ function Crouton(config) {
 				return prev +'&formats[]='+id;
 			}, '');
 		}
+		if (self.config.map_search && !Array.isArray(self.config['venue_types'])) {
+			self.config['venue_types'] = [];
+		}
 		if (self.config.map_search && self.config['venue_types'].length === 0) {
 			self.config['venue_types'].push('-2');
 		}
@@ -16476,13 +16459,15 @@ 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 {
-			self.filteredView(self.config.button_filters.find((bf) => bf.title.toLowerCase() === viewName).field);
+			self.groupedView(viewName.toUpperCase());
 		}
 	};
 
 	self.byDayView = function () {
-		self.lowlightButton(".filterButton");
+		self.lowlightButton(".groupingButton");
 		self.highlightButton("#day");
 		jQuery('.bmlt-page').each(function (index) {
 			self.hidePage("#" + this.id);
@@ -16495,7 +16480,7 @@ function Crouton(config) {
 	};
 
 	self.dayView = function () {
-		self.lowlightButton(".filterButton");
+		self.lowlightButton(".groupingButton");
 		self.highlightButton("#day");
 		jQuery('.bmlt-page').each(function (index) {
 			self.hidePage("#" + this.id);
@@ -16506,10 +16491,10 @@ function Crouton(config) {
 		});
 	};
 
-	self.filteredView = function (field) {
+	self.groupedView = function (field) {
 		self.lowlightButton("#day");
-		self.lowlightButton(".filterButton");
-		self.highlightButton("#filterButton_" + field);
+		self.lowlightButton(".groupingButton");
+		self.highlightButton("#groupingButton_" + field);
 		jQuery('.bmlt-page').each(function (index) {
 			self.hidePage("#" + this.id);
 			self.showPage("#byfield_" + field);
@@ -16534,9 +16519,9 @@ function Crouton(config) {
 	};
 	self.mapView = function() {
 		self.lowlightButton("#day");
-		self.lowlightButton(".filterButton");
-		self.highlightButton("#filterButton_embeddedMapPage");
-		self.filteredView("embeddedMapPage", false);
+		self.lowlightButton(".groupingButton");
+		self.highlightButton("#groupingButton_embeddedMapPage");
+		self.groupedView("embeddedMapPage", false);
 		croutonMap.showMap(false,false);
 	}
 	self.lowlightButton = function (id) {
@@ -16555,7 +16540,7 @@ function Crouton(config) {
 		jQuery("#tab-pane").removeClass("show").addClass("hide");
 	};
 
-	self.filteredPage = function () {
+	self.filterMeetingsFromView = function () {
 		jQuery(".meeting-header").removeClass("hide");
 		jQuery(".bmlt-data-row").removeClass("hide");
 		var filteringDropdown = false;
@@ -16626,8 +16611,27 @@ function Crouton(config) {
 		window.crouton = self;
 		croutonMap.initialize(self.createBmltMapElement(),self.meetingData,context,null,fitBounds,callback,self.config['noMap']);
 	}
+	self.retrieveGeolocation = function() {
+		return new Promise((resolve, reject) => {
+			if (window.storedGeolocation) {
+				resolve(window.storedGeolocation);
+			} else if (navigator.geolocation) {
+				navigator.geolocation.getCurrentPosition((position) => {
+					window.storedGeolocation = {
+						latitude: position.coords.latitude,
+						longitude: position.coords.longitude
+					};
+					resolve(window.storedGeolocation);
+				}, (error) => {
+					reject(new Error('Error getting geolocation: ' + error.message));
+				});
+			} else {
+				reject(new Error('Geolocation is not supported by this browser.'));
+			}
+		});
+	};
 	self.getCurrentLocation = function(callback) {
-		retrieveGeolocation().then(position => {
+		self.gretrieveGeolocation().then(position => {
 			callback(position);
 		}).catch(error => {
 			jQuery('.geo').removeClass("hide").addClass("show").html(`<p>${error.message}</p>`);
@@ -16782,7 +16786,7 @@ function Crouton(config) {
 	Crouton.prototype.filterNext24 = function(filterNow = true) {
 		if (!filterNow) {
 			jQuery("#filter-dropdown-next24").val('a-');
-			self.filteredPage();
+			self.filterMeetingsFromView();
 			return;
 		}
 		const date = new Date();
@@ -16811,33 +16815,9 @@ function Crouton(config) {
 			row.dataset.next24 = (next24.includes(row.id.split('-').pop())) ? '1' : '0';
 		});
 		jQuery("#filter-dropdown-next24").val('a-1');
-		self.filteredPage();
+		self.filterMeetingsFromView();
 	}
 
-	self.distance = function(lat1, lon1, lat2, lon2, unit) {
-		if ((lat1 === lat2) && (lon1 === lon2)) {
-			return 0;
-		} else {
-			var radlat1 = Math.PI * lat1/180;
-			var radlat2 = Math.PI * lat2/180;
-			var theta = lon1-lon2;
-			var radtheta = Math.PI * theta/180;
-			var dist = Math.sin(radlat1) * Math.sin(radlat2) + Math.cos(radlat1) * Math.cos(radlat2) * Math.cos(radtheta);
-			if (dist > 1) {
-				dist = 1;
-			}
-			dist = Math.acos(dist);
-			dist = dist * 180/Math.PI;
-			dist = dist * 60 * 1.1515;
-			if (unit === "K") {
-				return dist * 1.609344;
-			} else if (unit === "N") {
-				return dist * 0.8684;
-			} else {
-				return dist;
-			}
-		}
-	};
 	self.toFarsinNumber = function( n ) {
 		const farsiDigits = ['۰', '۱', '۲', '۳', '۴', '۵', '۶', '۷', '۸', '۹'];
 
@@ -17024,6 +17004,17 @@ function Crouton(config) {
 
 Crouton.prototype.setConfig = function(config) {
 	var self = this;
+	const deprecatedNames = {
+		button_filters: 'grouping_buttons',
+		button_format_filters: 'formattype_grouping_buttons',
+
+	}
+	for (var propertyName in deprecatedNames) {
+		if (config.hasOwnProperty(propertyName)) {
+			config[deprecatedNames[propertyName]] = config[propertyName];
+			delete configconfig[deprecatedNames[propertyName]];
+		}
+	}
 	for (var propertyName in config) {
 		if (propertyName.indexOf("_template") > 0 && config[propertyName].trim() === "") {
 			continue;
@@ -17081,7 +17072,7 @@ Crouton.prototype.reset = function() {
 };
 
 Crouton.prototype.doFilters = function() {
-	return this.filteredPage();
+	return this.filterMeetingsFromView();
 }
 Crouton.prototype.getServiceBodyDetails = function(serviceBodyId) {
 	var self = this;
@@ -17215,8 +17206,8 @@ Crouton.prototype.searchMap = function() {
 		"config": self.config,
 		"meetings": {
 			"weekdays": [],
-			"buttonFilters": [],
-			"buttonFormatFilters": [],
+			"groupingButtons": [],
+			"formattypeGroupingButtons": [],
 			"bydays": [],
 			"meetingCount": 0,
 			"meetingData": []
@@ -17229,7 +17220,7 @@ Crouton.prototype.render = function(doMeetingMap = false) {
 	var self = this;
 
 	if (!self.config.map_search) {
-		self.config.button_filters = self.config.button_filters.filter((b) => !b.field.startsWith('distance'));
+		self.config.grouping_buttons = self.config.grouping_buttons.filter((b) => !b.field.startsWith('distance'));
 		if (self.config['view_by'] == 'distance') self.config['view_by'] = 'weekday';
 	}
 	self.lock(function() {
@@ -17276,8 +17267,8 @@ Crouton.prototype.render = function(doMeetingMap = false) {
 
 				var day_counter = 0;
 				var byDayData = [];
-				var buttonFiltersData = {};
-				var buttonFormatFiltersData = {};
+				var groupingButtonsData = {};
+				var formattypeGroupingButtonsData = {};
 				var weekdaysData = [];
 				while (day_counter < 7) {
 					var day = self.config.day_sequence[day_counter];
@@ -17293,63 +17284,63 @@ Crouton.prototype.render = function(doMeetingMap = false) {
 						"meetings": daysOfTheWeekMeetings
 					});
 
-					for (var f = 0; f < self.config.button_filters.length; f++) {
-						var groupByName = self.config.button_filters[f]['field'];
+					for (var f = 0; f < self.config.grouping_buttons.length; f++) {
+						var groupByName = self.config.grouping_buttons[f]['field'];
 						if (groupByName.startsWith('distance')) continue;
 						var groupByData = getUniqueValuesOfKey(daysOfTheWeekMeetings, groupByName).sort();
 						for (var i = 0; i < groupByData.length; i++) {
 							var groupByMeetings = daysOfTheWeekMeetings.filterByObjectKeyValue(groupByName, groupByData[i]);
-							if (buttonFiltersData.hasOwnProperty(groupByName) && buttonFiltersData[groupByName].hasOwnProperty(groupByData[i])) {
-								buttonFiltersData[groupByName][groupByData[i]] = buttonFiltersData[groupByName][groupByData[i]].concat(groupByMeetings);
-							} else if (buttonFiltersData.hasOwnProperty(groupByName)) {
-								buttonFiltersData[groupByName][groupByData[i]] = groupByMeetings;
+							if (groupingButtonsData.hasOwnProperty(groupByName) && groupingButtonsData[groupByName].hasOwnProperty(groupByData[i])) {
+								groupingButtonsData[groupByName][groupByData[i]] = groupingButtonsData[groupByName][groupByData[i]].concat(groupByMeetings);
+							} else if (groupingButtonsData.hasOwnProperty(groupByName)) {
+								groupingButtonsData[groupByName][groupByData[i]] = groupByMeetings;
 							} else {
-								buttonFiltersData[groupByName] = {};
-								buttonFiltersData[groupByName][groupByData[i]] = groupByMeetings;
+								groupingButtonsData[groupByName] = {};
+								groupingButtonsData[groupByName][groupByData[i]] = groupByMeetings;
 							}
 
 						}
 					}
 
-					for (var f = 0; f < self.config.button_format_filters.length; f++) {
-						var groupByName = self.config.button_format_filters[f]['field'];
+					for (var f = 0; f < self.config.formattype_grouping_buttons.length; f++) {
+						var groupByName = self.config.formattype_grouping_buttons[f]['field'];
 						var groupByData = getUniqueFormatsOfType(daysOfTheWeekMeetings, groupByName);
 						if (groupByName=='LANG' && self.config.native_lang && self.config.native_lang.length > 0) {
 							groupByData = groupByData.filter((f) => f.key != self.config.native_lang);
 						}
 						for (var i = 0; i < groupByData.length; i++) {
 							var groupByMeetings = daysOfTheWeekMeetings.filter((item) => item.formats_expanded.map(f => f.key).indexOf(groupByData[i].key) >= 0);
-							if (buttonFormatFiltersData.hasOwnProperty(groupByName) && buttonFormatFiltersData[groupByName].hasOwnProperty(groupByData[i].description)) {
-								buttonFormatFiltersData[groupByName][groupByData[i].description] = buttonFormatFiltersData[groupByName][groupByData[i].description].concat(groupByMeetings);
-							} else if (buttonFormatFiltersData.hasOwnProperty(groupByName)) {
-								buttonFormatFiltersData[groupByName][groupByData[i].description] = groupByMeetings;
+							if (formattypeGroupingButtonsData.hasOwnProperty(groupByName) && formattypeGroupingButtonsData[groupByName].hasOwnProperty(groupByData[i].description)) {
+								formattypeGroupingButtonsData[groupByName][groupByData[i].description] = formattypeGroupingButtonsData[groupByName][groupByData[i].description].concat(groupByMeetings);
+							} else if (formattypeGroupingButtonsData.hasOwnProperty(groupByName)) {
+								formattypeGroupingButtonsData[groupByName][groupByData[i].description] = groupByMeetings;
 							} else {
-								buttonFormatFiltersData[groupByName] = {};
-								buttonFormatFiltersData[groupByName][groupByData[i].description] = groupByMeetings;
+								formattypeGroupingButtonsData[groupByName] = {};
+								formattypeGroupingButtonsData[groupByName][groupByData[i].description] = groupByMeetings;
 							}
 						}
 					}
 					day_counter++;
 				}
 
-				var buttonFiltersDataSorted = {};
-				for (var b = 0; b < self.config.button_filters.length; b++) {
-					var groupByName = self.config.button_filters[b]['field'];
-					buttonFiltersDataSorted[groupByName] = {};
+				var groupingButtonsDataSorted = {};
+				for (var b = 0; b < self.config.grouping_buttons.length; b++) {
+					var groupByName = self.config.grouping_buttons[b]['field'];
+					groupingButtonsDataSorted[groupByName] = {};
 					if (groupByName.startsWith('distance')) {
-						buttonFiltersDataSorted[groupByName]['Sorted by Distance'] = [...self.meetingData].sort((a,b) => a['distance_in_km'] - b['distance_in_km']);
+						groupingButtonsDataSorted[groupByName]['Sorted by Distance'] = [...self.meetingData].sort((a,b) => a['distance_in_km'] - b['distance_in_km']);
 						continue;
 					}
 					var sortKey = [];
 
-					for (var buttonFiltersDataItem in buttonFiltersData[groupByName]) {
-						sortKey.push(buttonFiltersDataItem);
+					for (var groupingButtonsDataItem in groupingButtonsData[groupByName]) {
+						sortKey.push(groupingButtonsDataItem);
 					}
 
 					sortKey.sort();
 
 					for (var s = 0; s < sortKey.length; s++) {
-						buttonFiltersDataSorted[groupByName][sortKey[s]] = buttonFiltersData[groupByName][sortKey[s]]
+						groupingButtonsDataSorted[groupByName][sortKey[s]] = groupingButtonsData[groupByName][sortKey[s]]
 					}
 				}
 
@@ -17424,8 +17415,8 @@ Crouton.prototype.render = function(doMeetingMap = false) {
 					"config": self.config,
 					"meetings": {
 						"weekdays": weekdaysData,
-						"buttonFilters": buttonFiltersDataSorted,
-						"buttonFormatFilters": buttonFormatFiltersData,
+						"groupingButtons": groupingButtonsDataSorted,
+						"formattypeGroupingButtons": formattypeGroupingButtonsData,
 						"bydays": byDayData,
 						"meetingCount": self.meetingData.length,
 						"meetingData": self.meetingData
@@ -17478,17 +17469,17 @@ Crouton.prototype.render = function(doMeetingMap = false) {
 					});
 
 					jQuery('.filter-dropdown').on('select2:select', function (e) {
-						self.filteredPage();
+						self.filterMeetingsFromView();
 					});
 
 					jQuery("#day").on('click', function () {
 						self.showView('day');
 					});
 
-					jQuery(".filterButtonLogic").on('click', function (e) {
+					jQuery(".groupingButtonLogic").on('click', function (e) {
 						self.showView(e.target.attributes['data-field'].value.toLowerCase());
 					});
-					jQuery('#filterButton_embeddedMapPage').on('click', function (e) {
+					jQuery('#groupingButton_embeddedMapPage').on('click', function (e) {
 						self.showView('map')
 					});
 					/****
@@ -17527,7 +17518,7 @@ Crouton.prototype.render = function(doMeetingMap = false) {
 					}
 					if (self.config['map_page'] && !doMeetingMap) {
 						if (self.meetingData.filter(m => m.venue_type != 2).length==0) {
-							jQuery('#filterButton_embeddedMapPage').addClass('hide');
+							jQuery('#groupingButton_embeddedMapPage').addClass('hide');
 						}
 						else croutonMap.initialize('byfield_embeddedMapPage', self.meetingData);
 					}
@@ -17850,7 +17841,7 @@ Crouton.prototype.simulateFilterDropdown = function() {
 	jQuery('.bmlt-page:not(#byfield_embeddedMapPage)').each(function () {
 		self.hidePage(this);
 	});
-	self.filteredPage();
+	self.filterMeetingsFromView();
 }
 Crouton.prototype.getAdjustedDateTime = function(meeting_day, meeting_time, meeting_time_zone) {
 	var timeZoneAware = this.config['auto_tz_adjust'] === true || this.config['auto_tz_adjust'] === "true";