@bmlt-enabled/croutonjs 4.1.1 → 4.1.3

package/crouton-gmaps.js

@@ -11979,7 +11979,7 @@ function CroutonLocalization(language) {
 			"google_directions": "مسیرهای Google به جلسه",
 			"apple_directions": "مسیرهای Apple به جلسه",
 			"no_meetings_for_this_day": "هیچ جلسه ای در این روز وجود ندارد",
-			"css-direction: bmlt-rtl": "",
+			"css-direction": "bmlt-rtl",
 			"bootstrap-popover-placement": "left",
 			"adjust search": "تنظیم جستجو",
 			"this number represents": "این عدد نشان دهنده",
@@ -13282,7 +13282,9 @@ this["hbs_Crouton"]["templates"]["groupDetails"] = Handlebars.template({"1":func
         return undefined
     };
 
-  return "<div class=\"card group\">\n    <div class=\"card-body\">\n        <div class=\"card-title header-elements\" style=\"display: flex; justify-content:space-between; align-items:center;\">\n"
+  return "<div class=\"card group "
+    + container.escapeExpression((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"css-direction",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":1,"column":23},"end":{"line":1,"column":50}}}))
+    + "\">\n    <div class=\"card-body\">\n        <div class=\"card-title header-elements\" style=\"display: flex; justify-content:space-between; align-items:center;\">\n"
     + ((stack1 = container.invokePartial(lookupProperty(partials,"groupTitle"),depth0,{"name":"groupTitle","data":data,"indent":"            ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "")
     + "        </div>\n        <div class=\"row\" "
     + ((stack1 = (lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"css-textAlign",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":6,"column":25},"end":{"line":6,"column":54}}})) != null ? stack1 : "")
@@ -15281,7 +15283,7 @@ function Crouton(config) {
 	self.currentView = "weekday";
 	self.distanceTabAllowed = false;
 	self.config = {
-		version: '4.1.1',            // CroutonJS version for debugging
+		version: '4.1.3',            // 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
@@ -16055,10 +16057,10 @@ function Crouton(config) {
 					commonFormats = commonFormats.filter(value => memberFormats.includes(value));
 				});
 				group['formats'] = commonFormats.join(',');
-				group['formats_expanded'] = group['formats_expanded'].filter((format) => commonFormats.includes(format['key']));
+				if (group['formats_expanded']) group['formats_expanded'] = group['formats_expanded'].filter((format) => commonFormats.includes(format['key']));
 				group['membersOfGroup'].forEach(function(member) {
 					member['formats'] = member['formats'].split(',').filter((f) => !commonFormats.includes(f)).join(',');
-					member['formats_expanded'] = member['formats_expanded'].filter((format) => !commonFormats.includes(format['key']));
+					if (member['formats_expanded']) member['formats_expanded'] = member['formats_expanded'].filter((format) => !commonFormats.includes(format['key']));
 				});
 			}
 		});
@@ -17187,7 +17189,9 @@ function MeetingMap(inConfig) {
 			}
 		});
 	}
-
+	function isFilterVisible() {
+		return config.filter_visible && config.filter_visible == 1;
+	}
 	/************************************************************************************//**
 	 *	\brief Load the map and set it up.													*
 	 ****************************************************************************************/
@@ -17214,7 +17218,7 @@ function MeetingMap(inConfig) {
 			if (handlebarMapOptions) loc = {latitude: handlebarMapOptions.lat, longitude: handlebarMapOptions.lng};
 			if (gDelegate.createMap(inDiv, loc, hide)) {
 				// crouton_map and filter_visible triggers a query, Otherwise, redraw markers
-				if (config.map_search && config.filter_visible) {
+				if (config.map_search && isFilterVisible()) {
 					gDelegate.addListener('idle', triggerCroutonMapNewQuery, false);
 				} else {
 					gDelegate.addListener('zoomend', function (ev) {
@@ -17512,7 +17516,7 @@ function MeetingMap(inConfig) {
 			let lat_lngs = gAllMeetings.reduce(function(a,m) {a.push([m.latitude, m.longitude]); return a;},[]);
 			const maxRadius = config.maxTomatoWidth/2.0;
 			if (gSearchPoint) lat_lngs.push([gSearchPoint.lat, gSearchPoint.lng]);
-			if (config.map_search && config.filter_visible) {
+			if (config.map_search && isFilterVisible()) {
 				lat_lngs.sort((a,b) =>  getDistance({"lat":a[0],"lng":a[1]},gSearchPoint) - getDistance({"lat":b[0],"lng":b[1]},gSearchPoint));
 				while (getLatLngRadius(lat_lngs) > maxRadius && lat_lngs.length > 3) {
 					lat_lngs = lat_lngs.slice(0, lat_lngs.length/2);
@@ -17520,18 +17524,21 @@ function MeetingMap(inConfig) {
 				if (getLatLngRadius(lat_lngs) > maxRadius)
 					lat_lngs = lat_lngs.slice(1,1);
 			}
-			gDelegate.fitBounds(lat_lngs);
+			if (lat_lngs.length > 0) gDelegate.fitBounds(lat_lngs);
 		}
 		searchResponseCallback();
 		hideThrobber();
-		if (config.filter_visible || config.centerMe || config.goto) crouton.forceShowMap();
+		if (isFilterVisible() || config.centerMe || config.goto) crouton.forceShowMap();
 		if (config.centerMe) {
 			if (navigator.geolocation) {
 				navigator.geolocation.getCurrentPosition(
 					function (position) {
 						coords = {latitude: position.coords.latitude, longitude: position.coords.longitude};
 						filterVisible(false);
-						gDelegate.setViewToPosition(coords, filterMeetingsAndBounds, filterVisible);
+						if (config.zoom) gDelegate.setZoom(false, config.zoom);
+						gDelegate.setViewToPosition(coords, filterMeetingsAndBounds, () => {
+							filterVisible(isFilterVisible());
+						});
 						gSearchPoint = {"lat": position.coords.latitude, "lng": position.coords.longitude};
 						crouton.updateDistances();
 					},
@@ -17541,10 +17548,10 @@ function MeetingMap(inConfig) {
 				showGeocodingDialog();
 			}
 		} else {
-			if ((!config.centerMe && !config.goto) && !(config.map_search && config.filter_visible)) {
-			  gDelegate.afterInit(()=>filterVisible(config.filter_visible));
+			if ((!config.centerMe && !config.goto) && !(config.map_search && isFilterVisible())) {
+			  gDelegate.afterInit(()=>filterVisible(isFilterVisible()));
 			}
-			if (config.goto) gDelegate.callGeocoder(config.goto, resetVisibleThenFilterMeetingsAndBounds);
+			if (config.goto) gDelegate.callGeocoder(config.goto, isFilterVisible() ? resetVisibleThenFilterMeetingsAndBounds : setVisibleThenFilterMeetingsAndBounds);
 		}
 	}
 	function createCityHash(allMeetings) {
@@ -17647,6 +17654,15 @@ function MeetingMap(inConfig) {
 		}
 		return ret;
 	}
+	function setVisibleThenFilterMeetingsAndBounds(bounds, center=null) {
+		filterVisible(false);
+		const ret = filterMeetingsAndBounds(bounds);
+		if (gSearchPoint.lat != center.lat || gSearchPoint.lng != center.lng) {
+			gSearchPoint = center;
+			crouton.updateDistances();
+		}
+		return ret;
+	}
 	function lookupLocation(fullscreen) {
 		if (document.getElementById('goto-text').value != '') {
 			if (fullscreen) {
@@ -17844,7 +17860,7 @@ function MeetingMap(inConfig) {
 	function onDragEnd() {
 		isMouseDown = false;
 		// if no [crouton_map], then turn filter visible back on.
-		if (config.map_search && config.filter_visible) triggerCroutonMapNewQuery(null);
+		if (config.map_search && isFilterVisible()) triggerCroutonMapNewQuery(null);
 		else filterVisible(true);
 	}
 	function triggerCroutonMapNewQuery(ev) {
@@ -18166,10 +18182,13 @@ function MapDelegate(in_config) {
         gAllMarkers = [];
         gOpenMarker = false;
     };
+    function isFilterVisible() {
+		return config.filter_visible && config.filter_visible == 1;
+	}
     function getZoomAdjust(only_out,filterMeetings) {
         if (!gMainMap) return 12;
         var ret = gMainMap.getZoom();
-        if (config.map_search && config.filter_visible) return ret;
+        if (config.map_search && isFilterVisible()) return ret;
         var center = gMainMap.getCenter();
         var bounds = gMainMap.getBounds();
         var zoomedOut = false;