Merge pull request #489 from bmlt-enabled/Google-maps-close-info-window

Fix InfoWindow close button on GoogleMaps
bmlt-enabled · Sep 9, 2024 · 113a23c · 113a23c
2 parents 938d5fc + 2a62a37
commit 113a23c
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 15 deletions.
diff --git a/crouton.php b/crouton.php
@@ -5,7 +5,7 @@
 Description: A tabbed based display for showing meeting information.
 Author: bmlt-enabled
 Author URI: https://bmlt.app
-Version: 3.19.4
+Version: 3.19.5
 */
 /* Disallow direct access to the plugin file */
 if (basename($_SERVER['PHP_SELF']) == basename(__FILE__)) {

diff --git a/croutonjs/meetingMap/css/meeting_map.css b/croutonjs/meetingMap/css/meeting_map.css
@@ -509,4 +509,18 @@ background-color: #EEEEEE;
   }
   .gm-style .gm-style-iw-c {
     padding: 0px;
+  }
+  #bmlt-map button.gm-ui-hover-effect {
+    right: 0px;
+    z-index: 999;
+    width: 20px !important;
+    height: 20px !important;
+  }
+  .gm-ui-hover-effect>span {
+    position: relative;
+    bottom: 13px;
+    right: 13px;
+}
+  #bmlt-map .gm-style-iw-chr {
+    height: 0 !important;
   }
diff --git a/croutonjs/meetingMap/js/meeting_map.js b/croutonjs/meetingMap/js/meeting_map.js
@@ -332,12 +332,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 +358,12 @@ 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.setProperty('top', newTop, 'important');
 		}
 	}
 	function showFilterDialog(e) {

diff --git a/croutonjs/src/css/bmlt_tabs.css b/croutonjs/src/css/bmlt_tabs.css
@@ -572,12 +572,6 @@ table.tablesaw {
 	}
 }
 
-@media only screen and (max-width: 480px) {
-	#bmlt-tabs .bmlt-column3 {
-		width: auto;
-	}
-}
-
 .mapcontrolslabel {
 	font-size: 12px;
 	cursor: pointer;

diff --git a/readme.txt b/readme.txt
@@ -4,8 +4,8 @@ Contributors: odathp, otrok7, radius314, pjaudiomv, californiasteve9390, Paul N,
 Tags: na, meeting list, meeting finder, maps, recovery, addiction, webservant, bmlt
 Requires at least: 4.0
 Required PHP: 8.0
-Tested up to: 6.4.2
-Stable tag: 3.19.4
+Tested up to: 6.6.1
+Stable tag: 3.19.5
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 crouton implements a Tabbed UI for BMLT.
@@ -36,6 +36,9 @@ https://demo.bmlt.app/crouton
 
 == Changelog ==
 
+= 3.19.5 =
+* Fix InfoWindow close button on GoogleMaps 
+
 = 3.19.4 =
 * Bug fix