@bmlt-enabled/croutonjs 3.18.10 → 3.18.12

package/crouton-gmaps.js

@@ -14835,7 +14835,7 @@ var croutonDefaultTemplates = {
 		"{{#isNotTemporarilyClosed this}}",
 		"    {{#unless (hasFormats 'VM' this)}}",
 		"        <div>",
-		"            <a onclick='crouton.meetingModal({{this.id_bigint}})' id='map-button' class='btn btn-primary btn-xs'>",
+		"            <a onclick='crouton.meetingModal({{this.id_bigint}})' tabindex='0' href='#' id='map-button' class='btn btn-primary btn-xs'>",
 		"				<span class='glyphicon glyphicon-search' aria-hidden='true'></span>",
 		"				{{getWord 'meeting details'}}",
 		"			</a>",
@@ -14865,10 +14865,10 @@ var croutonDefaultTemplates = {
 		"{{/if}}"
 	].join('\n'),
 	meeting_modal_template: [
-		"<a onclick='crouton.meetingModal({{this.id_bigint}})'><span class='glyphicon glyphicon-search' aria-hidden='true'></span>{{this.meeting_name}}</a>",
+		"<a tabindex='0' href='#' onclick='crouton.meetingModal({{this.id_bigint}})'><span class='glyphicon glyphicon-search' aria-hidden='true'></span>{{this.meeting_name}}</a>",
 	].join('\n'),
 	meetingpage_frame_template: `
-	<div id="meeting_modal" class="modal bootstrap-bmlt" style="display: none;">
+	<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">×</span>
 		<table id="meeting-details-table" class="bmlt-table table table-striped table-hover table-bordered tablesaw tablesaw-stack meeting-details">
@@ -14884,9 +14884,9 @@ var croutonDefaultTemplates = {
     		</tbody>
 		</table>
 		<div>
-			<a id="map-button" class="btn btn-primary btn-xs" href="{{{this.meeting_details_url}}}" target="_blank" rel="noopener noreferrer" style="float:left">
+			<a id="map-button" class="btn btn-primary btn-xs" href="{{{this.meeting_details_url}}}" tabindex="0" target="_blank" rel="noopener noreferrer" style="float:left">
 				{{getWord "Meeting Page"}}</a>
-			<a id="map-button" class="btn btn-primary btn-xs modal-close" style="float:right">
+			<a id="map-button" class="btn btn-primary btn-xs modal-close" tabindex="0" style="float:right">
 				{{getWord "Close"}}</a>
 		</div>
 	</div></div>`,
@@ -18047,6 +18047,7 @@ function MeetingMap(inConfig) {
 	var g_suspendedFullscreen = false;
 	function closeModalWindow(modal) {
 		gDelegate.modalOff();
+		activeModal = null;
 		if (!modal.classList.contains("modal"))
 			return closeModalWindow(modal.parentNode);
 		modal.style.display = "none";
@@ -18057,12 +18058,20 @@ function MeetingMap(inConfig) {
 			}
 		}
 	}
+	var activeModal = null;
+	document.addEventListener("keydown", function(event) {
+		if (activeModal && event.key == "Escape") {
+			closeModalWindow(activeModal);
+		}
+	}, true);
 	function openModalWindow(modal) {
 		if (isFullscreen()) {
 			g_suspendedFullscreen = true;
 			toggleFullscreen();
 		}
 		modal.style.display = "block";
+		modal.focus();
+		activeModal = modal;
 		dd = document.getElementById("map-menu-dropdown");
 		if (dd) dd.style.display = "none";
 		gDelegate.modalOn();