@bmlt-enabled/croutonjs 3.16.1 → 3.16.3

package/crouton.js

@@ -14602,6 +14602,7 @@ function Crouton(config) {
 
 	self.rowClick = function(id) {
 		var map_marker = self.findMarkerById(id);
+		if (!map_marker) return;
 		self.map.setCenter(map_marker.getPosition());
 		self.map.setZoom(17);
 		google.maps.event.trigger(map_marker, "click");
@@ -15560,7 +15561,7 @@ Crouton.prototype.render = function() {
 						dropdownCssClass: 'bmlt-drop'
 					});
 
-					jQuery('[data-toggle="popover"]').popover();
+					jQuery('[data-toggle="popover"]').popover().click(function(e) {e.preventDefault(); e.stopPropagation()});
 					jQuery('html').on('click', function (e) {
 						if (jQuery(e.target).data('toggle') !== 'popover') {
 							jQuery('[data-toggle="popover"]').popover('hide');
@@ -15736,25 +15737,12 @@ Crouton.prototype.renderMap = function() {
 		}
 	})
 };
-calculateBounds = function() {
-	var bounds = new google.maps.LatLngBounds();
-	// We go through all the results, and get the "spread" from them.
-	for (var c = 0; c < self.meetingData.length; c++) {
-		var lat = self.meetingData[c].latitude;
-		var lng = self.meetingData[c].longitude;
-		// We will set our minimum and maximum bounds.
-		bounds.extend(new google.maps.LatLng(lat, lng));
-	}
-	// We now have the full rectangle of our meeting search results. Scale the map to fit them.
-	self.map.fitBounds(bounds);
-
-}
 Crouton.prototype.initMap = function(callback) {
 	var self = this;
 	if (self.map == null) {
 		jQuery("#bmlt-tabs").before("<div id='bmlt-map' class='bmlt-map'></div>");
 		var mapOpt = { zoom: 3 };
-		if (self.handlebarMapOptions) mapOpt = {
+		if (self.handlebarMapOptions.length > 0) mapOpt = {
 			center: new google.maps.LatLng(self.handlebarMapOptions.lat, self.handlebarMapOptions.lng),
 			zoom: self.handlebarMapOptions.zoom,
 			mapTypeId:google.maps.MapTypeId.ROADMAP
@@ -15763,7 +15751,17 @@ Crouton.prototype.initMap = function(callback) {
 	}
 
  	jQuery("#bmlt-map").removeClass("hide");
-	if (!self.handlebarMapOptions) self.calculateBounds();
+	var bounds = new google.maps.LatLngBounds();
+	// We go through all the results, and get the "spread" from them.
+	for (var c = 0; c < self.meetingData.length; c++) {
+		if (self.meetingData[c].venue_type == venueType.VIRTUAL) continue;
+		var lat = self.meetingData[c].latitude;
+		var lng = self.meetingData[c].longitude;
+		// We will set our minimum and maximum bounds.
+		bounds.extend(new google.maps.LatLng(lat, lng));
+	}
+	// We now have the full rectangle of our meeting search results. Scale the map to fit them.
+	self.map.fitBounds(bounds);
 	var infoWindow = new google.maps.InfoWindow();
 
 	// Create OverlappingMarkerSpiderfier instance
@@ -15812,6 +15810,7 @@ Crouton.prototype.initMap = function(callback) {
 	// create an array of markers based on a given "locations" array.
 	// The map() method here has nothing to do with the Google Maps API.
 	self.meetingData.map(function (location, i) {
+		if (location.venue_type == venueType.VIRTUAL) return;
 		var marker_html = '<dl><dt><strong>';
 		marker_html += location.meeting_name;
 		marker_html += '</strong></dt>';