remove google map deprecations in template settings

Sacha Trauwaen · Sacha Trauwaen · commit 7621c870077a · 2024-04-24T15:37:40.000+02:00
diff --git a/OpenContent/Components/Alpaca/AlpacaEngine.cs b/OpenContent/Components/Alpaca/AlpacaEngine.cs
@@ -204,7 +204,7 @@ private void RegisterFields(bool bootstrap)
             if (allFields || fieldTypes.Contains("address") || fieldTypes.Contains("mladdress"))
             {
                 string apikey = App.Services.CreateGlobalSettingsRepository(PortalId).GetGoogleApiKey();
-                ClientResourceManager.RegisterScript(Page, "//maps.googleapis.com/maps/api/js?v=3.exp&libraries=places" + (string.IsNullOrEmpty(apikey) ? "" : "&key=" + apikey), FileOrder.Js.DefaultPriority);
+                ClientResourceManager.RegisterScript(Page, "//maps.googleapis.com/maps/api/js?loading=async&libraries=places" + (string.IsNullOrEmpty(apikey) ? "" : "&key=" + apikey), FileOrder.Js.DefaultPriority);
             }
             if (allFields || fieldTypes.ContainsAny("imagecropper", "imagecrop", "imagecrop2", "imagex", "mlimagex"))
             {
diff --git a/OpenContent/OpenContent.csproj b/OpenContent/OpenContent.csproj
@@ -1282,6 +1282,7 @@
     <Content Include="js\swagger\fonts\DroidSans-Bold.ttf" />
     <Content Include="js\swagger\fonts\DroidSans.ttf" />
     <Content Include="lama\src\components\CollectionField.vue" />
+    <Content Include="bundleconfig.json" />
     <None Include="packages.config" />
     <None Include="Scripts\_references.js" />
     <Content Include="js\select2\select2.css" />
diff --git a/OpenContent/alpaca/js/fields/dnn/AddressField.js b/OpenContent/alpaca/js/fields/dnn/AddressField.js
@@ -245,7 +245,7 @@
                             input.value = '';
 
                         });
-                        google.maps.event.addDomListener(input, 'keydown', function (e) {
+                        input.addEventListener('keydown', function (e) {
                             if (e.keyCode == 13) {
                                 e.preventDefault();
                             }
diff --git a/OpenContent/alpaca/js/fields/dnn/dnnfields.js b/OpenContent/alpaca/js/fields/dnn/dnnfields.js
@@ -245,7 +245,7 @@
                             input.value = '';
 
                         });
-                        google.maps.event.addDomListener(input, 'keydown', function (e) {
+                        input.addEventListener('keydown', function (e) {
                             if (e.keyCode == 13) {
                                 e.preventDefault();
                             }
diff --git a/OpenContent/alpaca/js/fields/dnn/dnnfields.min.js b/OpenContent/alpaca/js/fields/dnn/dnnfields.min.js
diff --git a/OpenContent/alpaca/templates/dnn-edit/dnntemplates.html b/OpenContent/alpaca/templates/dnn-edit/dnntemplates.html
@@ -418,4 +418,4 @@ <h4 class="panel-title pull-left">
         {{/compare}}
         {{/compare}}
     </div>
-</script>
+</script>

Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ private void RegisterFields(bool bootstrap)`
`204`	`204`	`if (allFields \|\| fieldTypes.Contains("address") \|\| fieldTypes.Contains("mladdress"))`
`205`	`205`	`{`
`206`	`206`	`string apikey = App.Services.CreateGlobalSettingsRepository(PortalId).GetGoogleApiKey();`
`207`		`- ClientResourceManager.RegisterScript(Page, "//maps.googleapis.com/maps/api/js?v=3.exp&libraries=places" + (string.IsNullOrEmpty(apikey) ? "" : "&key=" + apikey), FileOrder.Js.DefaultPriority);`
	`207`	`+ ClientResourceManager.RegisterScript(Page, "//maps.googleapis.com/maps/api/js?loading=async&libraries=places" + (string.IsNullOrEmpty(apikey) ? "" : "&key=" + apikey), FileOrder.Js.DefaultPriority);`
`208`	`208`	`}`
`209`	`209`	`if (allFields \|\| fieldTypes.ContainsAny("imagecropper", "imagecrop", "imagecrop2", "imagex", "mlimagex"))`
`210`	`210`	`{`
Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@`
`245`	`245`	`input.value = '';`
`246`	`246`
`247`	`247`	`});`
`248`		`- google.maps.event.addDomListener(input, 'keydown', function (e) {`
	`248`	`+ input.addEventListener('keydown', function (e) {`
`249`	`249`	`if (e.keyCode == 13) {`
`250`	`250`	`e.preventDefault();`
`251`	`251`	`}`