@bmlt-enabled/croutonjs 3.19.4 → 3.20.0

package/crouton-map.js

@@ -62,10 +62,10 @@ function MeetingMap(inConfig) {
 				}
 				if (config.map_search.zoom) {
 					config.zoom = config.map_search.zoom;
-				}	
+				}
 			}
 			let loc = {latitude: config.lat, longitude: config.lng, zoom: config.zoom};
-			if (handlebarMapOptions) loc = {latitude: handlebarMapOptions.lat, longitude: handlebarMapOptions.lng};		
+			if (handlebarMapOptions) loc = {latitude: handlebarMapOptions.lat, longitude: handlebarMapOptions.lng};
 			if (gDelegate.createMap(inDiv, loc)) {
 				gDelegate.addListener('zoomend', function (ev) {
 					if (shouldRedrawMarkers() && gAllMeetings) {
@@ -79,7 +79,11 @@ function MeetingMap(inConfig) {
 					menuContext.imageDir = config.BMLTPlugin_images;
 					gDelegate.addControl(createNext24Toggle(), 'topleft');
 					gDelegate.addControl(createMenuButton(menuContext), 'topright', cb);
-				};
+				}
+				else {
+					menuContext = {imageDir: config.BMLTPlugin_images, config: config, dropdownData:false};
+					gDelegate.addControl(createMenuButton(menuContext), 'topright', cb);
+				}
 			}
 		};
 	};
@@ -148,6 +152,7 @@ function MeetingMap(inConfig) {
 		controlDiv.innerHTML = template(menuContext);
 		controlDiv.querySelector("#nearbyMeetings").addEventListener('click', function (e) {
 			retrieveGeolocation().then(position => {
+				filterVisible(false);
 				gDelegate.setViewToPosition(position, filterMeetingsAndBounds);
 			}).catch(error => {
 				console.error(error.message);
@@ -157,14 +162,19 @@ function MeetingMap(inConfig) {
 		});
 
 		controlDiv.querySelector("#lookupLocation").addEventListener('click', showGeocodingDialog);
-		controlDiv.querySelector("#filterMeetings").addEventListener('click', showFilterDialog);
-		controlDiv.querySelector("#showAsTable").addEventListener('click', showListView);
+		if (menuContext && menuContext.dropdownData) {
+			controlDiv.querySelector("#filterMeetings").addEventListener('click', showFilterDialog);
+			controlDiv.querySelector("#showAsTable").addEventListener('click', showListView);
+		} else {
+			controlDiv.querySelector("#filterTable").addEventListener('click', toggleVisible);
+		}
 		controlDiv.querySelector("#fullscreenMode").addEventListener('click', toggleFullscreen);
 		controlDiv.querySelector("#map-menu-button").addEventListener('click', function (e) {
 			let dropdownContent = document.getElementById("map-menu-dropdown");
-			if (dropdownContent.style.display == "inline-block")
+			if (dropdownContent.style.display == "inline-block") {
 				dropdownContent.style.display = "none";
-			else
+				filterVisible(false);
+			} else
 				dropdownContent.style.display = "inline-block";
 		});
 		[...controlDiv.getElementsByClassName('modal-close')].forEach((elem)=>elem.addEventListener('click', (e)=>closeModalWindow(e.target)));
@@ -303,7 +313,7 @@ function MeetingMap(inConfig) {
 				showGeocodingDialog();
 			}
 		} else if (config.goto) {
-			gDelegate.callGeocoder(goto, filterMeetingsAndBounds);
+			gDelegate.callGeocoder(config.goto, filterMeetingsAndBounds);
 		}
 	}
 	function createCityHash(allMeetings) {
@@ -332,12 +342,11 @@ function MeetingMap(inConfig) {
 			}
 		}
 		if (swipableModal) {
-			const body = document.getElementsByTagName("BODY")[0];
+			const body = document.body;
 			const scrollY = body.style.top;
 			body.style.overflowX = g_overflowX;
 			body.style.position = '';
 			body.style.top = '';
-			body.style.width = '';
 			window.scrollTo(0, parseInt(scrollY || '0') * -1);
 		}
 	}
@@ -359,14 +368,13 @@ function MeetingMap(inConfig) {
 		if (dd) dd.style.display = "none";
 		gDelegate.modalOn();
 		if (swipableModal) {
-			const body = document.getElementsByTagName("BODY")[0];
+			const body = document.body;
 			g_overflowX = body.style.overflowX;
 			const newTop = -window.scrollY+'px';
-			const newWidth = window.width+'px';
 			body.style.overflowX = 'hidden';
 			body.style.position = 'fixed';
-			body.style.top = newTop;
-			body.style.width = newWidth;
+			body.style.width="100%";
+			body.style.setProperty('top', newTop, 'important');
 		}
 	}
 	function showFilterDialog(e) {
@@ -397,14 +405,18 @@ function MeetingMap(inConfig) {
 		jQuery("#table_page").addClass("hide");
 		jQuery("#bmlt-map").css("display", "block");
 	}
+	function resetVisibleThenFilterMeetingsAndBounds(bounds) {
+		filterVisible(false);
+		filterMeetingsAndBounds(bounds);
+	}
 	function lookupLocation(fullscreen) {
 		if (document.getElementById('goto-text').value != '') {
 			if (fullscreen) {
 				gDelegate.addListener('idle', function () {
-					gDelegate.callGeocoder(document.getElementById('goto-text').value, filterMeetingsAndBounds);
+					gDelegate.callGeocoder(document.getElementById('goto-text').value, resetVisibleThenFilterMeetingsAndBounds);
 				}, true);
 			} else {
-				gDelegate.callGeocoder(document.getElementById('goto-text').value, filterMeetingsAndBounds);
+				gDelegate.callGeocoder(document.getElementById('goto-text').value, resetVisibleThenFilterMeetingsAndBounds);
 			}
 		} else {
 			alert("");
@@ -456,12 +468,12 @@ function MeetingMap(inConfig) {
 			? filtered.map((m)=>[m])
 			: mapOverlappingMarkersInCity(filtered);
 
-		if (useMarkerCluster()) gDelegate.createClusterLayer(); 
+		if (useMarkerCluster()) gDelegate.createClusterLayer();
 		// Draw the meeting markers.
 		overlap_map.forEach(function (marker) {
 			createMapMarker(marker);
 		});
-		gDelegate.addClusterLayer(); 
+		gDelegate.addClusterLayer();
 		if (expand) {
 			const lat_lngs = filtered.reduce(function(a,m) {a.push([m.latitude, m.longitude]); return a;},[]);
 			gDelegate.fitBounds(lat_lngs);
@@ -566,20 +578,27 @@ function MeetingMap(inConfig) {
 			(meetings.length > 1),
 			marker_html, null ,meetings.map((m)=>parseInt(m.id_bigint)));
 	};
+	var listOnlyVisible = false;
 	function filterBounds(bounds) {
 		return gAllMeetings.filter((meeting) => gDelegate.contains(bounds, meeting.latitude, meeting.longitude));
 	}
 	function filterVisible(on=true) {
+		if (on===listOnlyVisible) return;
 		let mtgs = on ? filterBounds(gDelegate.getBounds()) : gAllMeetings;
 		let visible = mtgs.map((m)=>m.id_bigint);
 		jQuery(".bmlt-data-row").each(function(index,row) {
 			row.dataset.visible = (visible.includes(row.id.split('-').pop())) ? '1' : '0';
 		});
 		jQuery("#byday").removeClass('hide');
-		jQuery("#filter-dropdown-visibile").val('a-1');
+		jQuery("#filter-dropdown-visibile").val(on?'a-1':'');
 		fitDuringFilter = false;
-		crouton.doFilters();
+		crouton.simulateFilterDropdown();
 		fitDuringFilter = true;
+		jQuery("#filteringByVisibility").html(on?'✔':'');
+		listOnlyVisible = on;
+	}
+	function toggleVisible() {
+		filterVisible(!listOnlyVisible);
 	}
 	function filterBounds(bounds) {
 		var ret = gAllMeetings.filter((meeting) =>