From e68bd813c3d034814a97349df450ae45ff589068 Mon Sep 17 00:00:00 2001
From: Matt Peel <matt.peel@akqa.com>
Date: Wed, 10 Sep 2025 01:27:47 +1200
Subject: [PATCH 1/2] fix: Add googlemapfield class name so JS actually binds
 to the fields correctly, but not to the field holder

---
 src/GoogleMapField.php                         | 2 ++
 templates/BetterBrief/GoogleMapField_holder.ss | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/GoogleMapField.php b/src/GoogleMapField.php
index f385e57..927921f 100644
--- a/src/GoogleMapField.php
+++ b/src/GoogleMapField.php
@@ -79,6 +79,8 @@ public function __construct($name, $title = null, $value = null, $data = [],  $o
             $this->defaultValues = $data;
         }
 
+        $this->addExtraClass('googlemapfield');
+
         $this->setupChildren();
 
     }
diff --git a/templates/BetterBrief/GoogleMapField_holder.ss b/templates/BetterBrief/GoogleMapField_holder.ss
index df878d9..f746802 100644
--- a/templates/BetterBrief/GoogleMapField_holder.ss
+++ b/templates/BetterBrief/GoogleMapField_holder.ss
@@ -1,4 +1,4 @@
-<div id="$HolderID" class="field<% if $extraClass %> $extraClass<% end_if %>">
+<div id="$HolderID" class="field">
 	<% if $Title %><label class="left" for="$ID">$Title</label><% end_if %>
 	<div class="middleColumn">
 		$Field

From ff91a85a415e119f14fd6d1834c641e58dda2da7 Mon Sep 17 00:00:00 2001
From: Matt Peel <matt.peel@akqa.com>
Date: Wed, 10 Sep 2025 01:42:33 +1200
Subject: [PATCH 2/2] fix: Don't look for visible fields when race conditions
 prevent it being visible sometimes

---
 client/js/GoogleMapField.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/js/GoogleMapField.js b/client/js/GoogleMapField.js
index f99992a..84bd56c 100644
--- a/client/js/GoogleMapField.js
+++ b/client/js/GoogleMapField.js
@@ -232,7 +232,7 @@ window.googlemapfieldInit = function () {
     };
 
     function init() {
-        var mapFields = $(".googlemapfield:visible").gmapfield();
+        var mapFields = $(".googlemapfield").gmapfield();
 
         mapFields.each(initField);
     }