@bmlt-enabled/croutonjs 3.21.2 → 3.22.1

package/crouton.nojquery.js

@@ -14199,83 +14199,66 @@ CroutonLocalization.prototype.getServiceBodyType = function(type) {
 this["hbs_Crouton"] = this["hbs_Crouton"] || {};
 this["hbs_Crouton"]["templates"] = this["hbs_Crouton"]["templates"] || {};
 this["hbs_Crouton"]["templates"]["byday"] = Handlebars.template({"1":function(container,depth0,helpers,partials,data) {
-    var stack1, lookupProperty = container.lookupProperty || function(parent, propertyName) {
+    var stack1, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=container.hooks.helperMissing, alias3=container.lambda, alias4=container.escapeExpression, lookupProperty = container.lookupProperty || function(parent, propertyName) {
         if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
           return parent[propertyName];
         }
         return undefined
     };
 
-  return "            <tbody class=\"bmlt-data-rows h-"
-    + container.escapeExpression(container.lambda((depth0 != null ? lookupProperty(depth0,"day") : depth0), depth0))
+  return "            <div class=\"meeting-group\" "
+    + ((stack1 = (lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"css-textAlign",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":3,"column":39},"end":{"line":3,"column":68}}})) != null ? stack1 : "")
+    + ">\n                <div class=\"group-header\">"
+    + alias4(alias3((depth0 != null ? lookupProperty(depth0,"day") : depth0), depth0))
+    + "</div>\n                <div class=\"group-table-div\">\n                    <table class='bmlt-table table table-striped table-hover table-bordered tablesaw tablesaw-stack "
+    + alias4((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"css-direction",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":6,"column":116},"end":{"line":6,"column":143}}}))
+    + "'>\n                        <tbody class=\"h-"
+    + alias4(alias3((depth0 != null ? lookupProperty(depth0,"day") : depth0), depth0))
     + "\">\n"
-    + ((stack1 = lookupProperty(helpers,"unless").call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? lookupProperty(depth0,"hide") : depth0),{"name":"unless","hash":{},"fn":container.program(2, data, 0),"inverse":container.noop,"data":data,"loc":{"start":{"line":5,"column":3},"end":{"line":11,"column":14}}})) != null ? stack1 : "")
-    + "\n"
-    + ((stack1 = container.invokePartial(lookupProperty(partials,"meetings"),(depth0 != null ? lookupProperty(depth0,"meetings") : depth0),{"name":"meetings","data":data,"indent":"            ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "")
-    + "            </tbody>\n";
-},"2":function(container,depth0,helpers,partials,data) {
-    var stack1, lookupProperty = container.lookupProperty || function(parent, propertyName) {
-        if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
-          return parent[propertyName];
-        }
-        return undefined
-    };
-
-  return ((stack1 = (lookupProperty(helpers,"greaterThan")||(depth0 && lookupProperty(depth0,"greaterThan"))||container.hooks.helperMissing).call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? lookupProperty(depth0,"meetings") : depth0)) != null ? lookupProperty(stack1,"length") : stack1),0,{"name":"greaterThan","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data,"loc":{"start":{"line":6,"column":4},"end":{"line":10,"column":20}}})) != null ? stack1 : "");
-},"3":function(container,depth0,helpers,partials,data) {
-    var stack1, lookupProperty = container.lookupProperty || function(parent, propertyName) {
-        if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
-          return parent[propertyName];
-        }
-        return undefined
-    };
-
-  return "					<tr class=\"meeting-header\">\n						<td colspan=\"3\" "
-    + ((stack1 = (lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||container.hooks.helperMissing).call(depth0 != null ? depth0 : (container.nullContext || {}),"css-textAlign",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":8,"column":22},"end":{"line":8,"column":51}}})) != null ? stack1 : "")
-    + ">"
-    + container.escapeExpression(container.lambda((depth0 != null ? lookupProperty(depth0,"day") : depth0), depth0))
-    + "</td>\n					</tr>\n";
+    + ((stack1 = container.invokePartial(lookupProperty(partials,"meetings"),(depth0 != null ? lookupProperty(depth0,"meetings") : depth0),{"name":"meetings","data":data,"indent":"                            ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "")
+    + "                        </tbody>\n                    </table>\n                </div>\n            </div>\n";
 },"compiler":[8,">= 4.3.0"],"main":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty = container.lookupProperty || function(parent, propertyName) {
+    var stack1, lookupProperty = container.lookupProperty || function(parent, propertyName) {
         if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
           return parent[propertyName];
         }
         return undefined
     };
 
-  return "<div id=\"bmlt-table-div\">\n    <table class='bmlt-table table table-striped table-hover table-bordered tablesaw tablesaw-stack "
-    + container.escapeExpression((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||container.hooks.helperMissing).call(alias1,"css-direction",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":2,"column":100},"end":{"line":2,"column":127}}}))
-    + "'>\n"
-    + ((stack1 = lookupProperty(helpers,"each").call(alias1,depth0,{"name":"each","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data,"loc":{"start":{"line":3,"column":8},"end":{"line":15,"column":17}}})) != null ? stack1 : "")
-    + "    </table>\n</div>\n";
+  return "<div id=\"bmlt-table-div\">\n"
+    + ((stack1 = lookupProperty(helpers,"each").call(depth0 != null ? depth0 : (container.nullContext || {}),depth0,{"name":"each","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data,"loc":{"start":{"line":2,"column":8},"end":{"line":13,"column":17}}})) != null ? stack1 : "")
+    + "</div>\n";
 },"usePartial":true,"useData":true});
 this["hbs_Crouton"]["templates"]["byfield"] = Handlebars.template({"1":function(container,depth0,helpers,partials,data) {
-    var stack1, helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=container.hooks.helperMissing, lookupProperty = container.lookupProperty || function(parent, propertyName) {
+    var stack1, helper, alias1=container.escapeExpression, alias2=depth0 != null ? depth0 : (container.nullContext || {}), alias3=container.hooks.helperMissing, lookupProperty = container.lookupProperty || function(parent, propertyName) {
         if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
           return parent[propertyName];
         }
         return undefined
     };
 
-  return "			<tr class=\"meeting-header\" "
-    + ((stack1 = (lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"css-textAlign",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":5,"column":30},"end":{"line":5,"column":59}}})) != null ? stack1 : "")
-    + ">\n				<td colspan=\"3\">"
-    + container.escapeExpression(((helper = (helper = lookupProperty(helpers,"key") || (data && lookupProperty(data,"key"))) != null ? helper : alias2),(typeof helper === "function" ? helper.call(alias1,{"name":"key","hash":{},"data":data,"loc":{"start":{"line":6,"column":20},"end":{"line":6,"column":28}}}) : helper)))
-    + "</td>\n			</tr>\n"
-    + ((stack1 = container.invokePartial(lookupProperty(partials,"meetings"),depth0,{"name":"meetings","data":data,"indent":"\t\t\t","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
+  return "            <div class=\"meeting-group "
+    + alias1(container.lambda((depth0 != null ? lookupProperty(depth0,"accordionState") : depth0), depth0))
+    + "\" "
+    + ((stack1 = (lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias3).call(alias2,"css-textAlign",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":3,"column":63},"end":{"line":3,"column":92}}})) != null ? stack1 : "")
+    + ">\n                <div class=\"group-header\">"
+    + alias1(((helper = (helper = lookupProperty(helpers,"key") || (data && lookupProperty(data,"key"))) != null ? helper : alias3),(typeof helper === "function" ? helper.call(alias2,{"name":"key","hash":{},"data":data,"loc":{"start":{"line":4,"column":42},"end":{"line":4,"column":50}}}) : helper)))
+    + "</div>\n                <div class=\"group-table-div\">\n					<table class='bmlt-table table table-striped table-hover table-bordered tablesaw tablesaw-stack "
+    + alias1((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias3).call(alias2,"css-direction",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":6,"column":101},"end":{"line":6,"column":128}}}))
+    + "'>\n                    	<tbody class=\"byfield.hbs\">\n"
+    + ((stack1 = container.invokePartial(lookupProperty(partials,"meetings"),(depth0 != null ? lookupProperty(depth0,"group") : depth0),{"name":"meetings","data":data,"indent":"                        \t","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "")
+    + "                    	</tbody>\n                	</table>\n				</div>\n            </div>\n";
 },"compiler":[8,">= 4.3.0"],"main":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty = container.lookupProperty || function(parent, propertyName) {
+    var stack1, lookupProperty = container.lookupProperty || function(parent, propertyName) {
         if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
           return parent[propertyName];
         }
         return undefined
     };
 
-  return "<div id=\"bmlt-table-div\">\n	<table class='bmlt-table table table-striped table-hover table-bordered tablesaw tablesaw-stack "
-    + container.escapeExpression((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||container.hooks.helperMissing).call(alias1,"css-direction",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":2,"column":97},"end":{"line":2,"column":124}}}))
-    + "'>\n		<tbody class=\"byfield.hbs\">\n"
-    + ((stack1 = lookupProperty(helpers,"each").call(alias1,depth0,{"name":"each","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data,"loc":{"start":{"line":4,"column":2},"end":{"line":9,"column":11}}})) != null ? stack1 : "")
-    + "		</tbody>\n	</table>\n</div>\n";
+  return "<div id=\"bmlt-table-div\">\n"
+    + ((stack1 = lookupProperty(helpers,"each").call(depth0 != null ? depth0 : (container.nullContext || {}),depth0,{"name":"each","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data,"loc":{"start":{"line":2,"column":8},"end":{"line":13,"column":17}}})) != null ? stack1 : "")
+    + "    </table>\n</div>";
 },"usePartial":true,"useData":true});
 this["hbs_Crouton"]["templates"]["formatPopup"] = Handlebars.template({"1":function(container,depth0,helpers,partials,data) {
     var helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=container.hooks.helperMissing, alias3="function", alias4=container.escapeExpression, lookupProperty = container.lookupProperty || function(parent, propertyName) {
@@ -16131,7 +16114,6 @@ crouton_Handlebars.registerHelper("enrich", () => '');
 crouton_Handlebars.registerHelper('selectFormatPopup', () => "formatPopup");
 crouton_Handlebars.registerHelper('selectObserver', () => "observerTemplate");
 
-
 function Crouton(config) {
 	var self = this;
 	self.mutex = false;
@@ -16146,7 +16128,7 @@ function Crouton(config) {
 		time_format: "h:mm a",        // The format for time
 		language: "en-US",            // Default language translation, available translations listed here: https://github.com/bmlt-enabled/crouton/blob/master/croutonjs/src/js/crouton-localization.js
 		has_tabs: true,               // Shows the day tabs
-		filter_tabs: 0,   		  // Whether to show weekday tabs on filtering.
+		filter_tabs: 20,   		  // Whether to show weekday tabs on filtering.
 		filter_visible: 0,		  // whether entries in table should be limited to those visible in map
 		header: true,                 // Shows the dropdowns and buttons
 		include_weekday_button: true, // Shows the weekday button
@@ -16195,7 +16177,7 @@ function Crouton(config) {
 		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
 		force_language_in_querystring: true, // Set to false to shorten generated meeting detail query strings
-		theme: "jack",                // Allows for setting pre-packaged themes.  Choices are listed here:  https://github.com/bmlt-enabled/crouton/blob/master/croutonjs/dist/templates/themes
+		theme: "jack",                // Allows for setting pre-packaged themes.  Choices are listed here:  https://github.com/bmlt-enabled/crouton/blob/master/croutonjs/src/templates/themes
 		report_update_url: "",   	  // URL to edit a meeting for BMLT-workflow plugin
 		meeting_data_template: croutonDefaultTemplates.meeting_data_template,
 		metadata_template: croutonDefaultTemplates.metadata_template,
@@ -16446,10 +16428,10 @@ function Crouton(config) {
 			if (!self.config['has_tabs'] || (self.config['filter_tabs'] && self.config['filter_tabs'] >= showingNow)) {
 				self.byDayView();
 
-				jQuery(".bmlt-data-rows").each(function (index, value) {
-					if (jQuery(value).find(".bmlt-data-row.hide").length === jQuery(value).find(".bmlt-data-row").length) {
-						jQuery(value).find(".meeting-header").addClass("hide");
-					}
+				jQuery("#byday").find('.meeting-group').each(function(index) {
+					if (jQuery(this).find(".bmlt-data-row.hide").length === jQuery(this).find(".bmlt-data-row").length)
+						jQuery(this).addClass("hide");
+					else jQuery(this).removeClass('hide');
 				});
 			} else {
 				self.dayView();
@@ -16495,25 +16477,13 @@ function Crouton(config) {
 		jQuery('.bmlt-page').each(function (index) {
 			self.hidePage("#" + this.id);
 			self.showPage("#byfield_" + field);
-			jQuery("#byfield_" + field).find('.meeting-header').each(function(index) {
-				// This is an awkward way of doing things, but I don't want to mess with
-				// the generated HTML at this point.
-				let flag = false;
-				let item = jQuery(this);
-				const main = item;
-				while(item = item.next()) {
-					if (item.length === 0) break;
-					if (item.hasClass('meeting-header')) break;
-					if (!item.hasClass('hide')) {
-						flag = true;
-						break;
-					}
-				}
-				if (!flag) main.addClass('hide');
-			})
-			return;
+			jQuery("#byfield_" + field).find('.meeting-group').each(function(index) {
+				if (jQuery(this).find(".bmlt-data-row.hide").length === jQuery(this).find(".bmlt-data-row").length)
+					jQuery(this).addClass("hide");
+				else jQuery(this).removeClass('hide');
+			});
 		});
-	};
+	}
 	self.mapView = function() {
 		self.lowlightButton("#day");
 		self.lowlightButton(".groupingButton");
@@ -16538,13 +16508,12 @@ function Crouton(config) {
 	};
 
 	self.filterMeetingsFromView = function () {
-		jQuery(".meeting-header").removeClass("hide");
+		jQuery(".group-header").removeClass("hide");
+		jQuery(".meeting-group").removeClass("hide");
 		jQuery(".bmlt-data-row").removeClass("hide");
-		var filteringDropdown = false;
 		jQuery(".filter-dropdown").each(function(index, filter) {
 			const dataValue = filter.value.replace("a-", "");
 			if (dataValue === "") return;
-			filteringDropdown = true;
 			const dataType = filter.getAttribute("data-pointer").toLowerCase();
 			if (dataType !== "formats" && dataType !== "languages" && dataType !== "venues" && dataType !== "common_needs") {
 				jQuery(".bmlt-data-row").not("[data-" + dataType + "='" + dataValue + "']").addClass("hide");
@@ -16571,7 +16540,8 @@ function Crouton(config) {
 		self.updateFilters();
 		self.updateMeetingCount();
 		jQuery(".filter-dropdown").val(null).trigger("change");
-		jQuery(".meeting-header").removeClass("hide");
+		jQuery(".group-header").removeClass("hide");
+		jQuery(".meeting-group").removeClass("hide");
 		jQuery(".bmlt-data-row").removeClass("hide");
 		jQuery(".evenRow").removeClass("evenRow");
 		jQuery(".oddRow").removeClass("oddRow");
@@ -16601,7 +16571,6 @@ function Crouton(config) {
 	}
 	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']);
@@ -17004,12 +16973,11 @@ Crouton.prototype.setConfig = function(config) {
 	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]];
+			delete config[deprecatedNames[propertyName]];
 		}
 	}
 	for (var propertyName in config) {
@@ -17276,7 +17244,6 @@ Crouton.prototype.render = function(doMeetingMap = false) {
 					});
 
 					byDayData.push({
-						"hide": self.config["hide_byday_headers"],
 						"day": self.localization.getDayOfTheWeekWord(day),
 						"meetings": daysOfTheWeekMeetings
 					});
@@ -17300,7 +17267,9 @@ Crouton.prototype.render = function(doMeetingMap = false) {
 					}
 
 					for (var f = 0; f < self.config.formattype_grouping_buttons.length; f++) {
-						var groupByName = self.config.formattype_grouping_buttons[f]['field'];
+						const groupByName = self.config.formattype_grouping_buttons[f]['field'];
+						const accordionState = self.config.formattype_grouping_buttons[f].hasOwnProperty('accordionState')
+							? self.config.grouping_buttons[b]['accordionState'] : '';
 						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);
@@ -17308,12 +17277,16 @@ Crouton.prototype.render = function(doMeetingMap = false) {
 						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 (formattypeGroupingButtonsData.hasOwnProperty(groupByName) && formattypeGroupingButtonsData[groupByName].hasOwnProperty(groupByData[i].description)) {
-								formattypeGroupingButtonsData[groupByName][groupByData[i].description] = formattypeGroupingButtonsData[groupByName][groupByData[i].description].concat(groupByMeetings);
+								formattypeGroupingButtonsData[groupByName][groupByData[i].description].group = formattypeGroupingButtonsData[groupByName][groupByData[i].description].group.concat(groupByMeetings);
 							} else if (formattypeGroupingButtonsData.hasOwnProperty(groupByName)) {
-								formattypeGroupingButtonsData[groupByName][groupByData[i].description] = groupByMeetings;
+								formattypeGroupingButtonsData[groupByName][groupByData[i].description] = {};
+								formattypeGroupingButtonsData[groupByName][groupByData[i].description].accordionState = accordionState;
+								formattypeGroupingButtonsData[groupByName][groupByData[i].description].group = groupByMeetings;
 							} else {
 								formattypeGroupingButtonsData[groupByName] = {};
-								formattypeGroupingButtonsData[groupByName][groupByData[i].description] = groupByMeetings;
+								formattypeGroupingButtonsData[groupByName][groupByData[i].description] = {};
+								formattypeGroupingButtonsData[groupByName][groupByData[i].description].accordionState = accordionState;
+								formattypeGroupingButtonsData[groupByName][groupByData[i].description].group = groupByMeetings;
 							}
 						}
 					}
@@ -17322,10 +17295,14 @@ Crouton.prototype.render = function(doMeetingMap = false) {
 
 				var groupingButtonsDataSorted = {};
 				for (var b = 0; b < self.config.grouping_buttons.length; b++) {
-					var groupByName = self.config.grouping_buttons[b]['field'];
+					const groupByName = self.config.grouping_buttons[b]['field'];
+					const accordionState = self.config.grouping_buttons[b].hasOwnProperty('accordionState')
+						? self.config.grouping_buttons[b]['accordionState'] : '';
 					groupingButtonsDataSorted[groupByName] = {};
 					if (groupByName.startsWith('distance')) {
-						groupingButtonsDataSorted[groupByName]['Sorted by Distance'] = [...self.meetingData].sort((a,b) => a['distance_in_km'] - b['distance_in_km']);
+						groupingButtonsDataSorted[groupByName]['Sorted by Distance'] = {};
+						groupingButtonsDataSorted[groupByName]['Sorted by Distance'].group = [...self.meetingData].sort((a,b) => a['distance_in_km'] - b['distance_in_km']);
+						groupingButtonsDataSorted[groupByName]['Sorted by Distance'].accordionState = 'non-collapsable';
 						continue;
 					}
 					var sortKey = [];
@@ -17337,7 +17314,9 @@ Crouton.prototype.render = function(doMeetingMap = false) {
 					sortKey.sort();
 
 					for (var s = 0; s < sortKey.length; s++) {
-						groupingButtonsDataSorted[groupByName][sortKey[s]] = groupingButtonsData[groupByName][sortKey[s]]
+						groupingButtonsDataSorted[groupByName][sortKey[s]] = {};
+						groupingButtonsDataSorted[groupByName][sortKey[s]].group = groupingButtonsData[groupByName][sortKey[s]];
+						groupingButtonsDataSorted[groupByName][sortKey[s]].accordionState = accordionState;
 					}
 				}
 
@@ -17479,6 +17458,9 @@ Crouton.prototype.render = function(doMeetingMap = false) {
 					jQuery('#groupingButton_embeddedMapPage').on('click', function (e) {
 						self.showView('map')
 					});
+					jQuery('.meeting-group:not(.non-collapsable) .group-header').on('click', function(e) {
+						jQuery(e.target.parentElement).toggleClass('closed');
+					})
 					/****
 					jQuery('.custom-ul').on('click', 'a', function (event) {
 						jQuery('.bmlt-page').each(function (index) {