From 4b34a7d300ffb0770607c56adf0a4733e0870f15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Mon, 8 Jan 2024 19:14:10 +0100
Subject: [PATCH] merge index.js with global.js

---
 umap/static/umap/js/modules/global.js |   7 +-
 umap/static/umap/js/modules/index.js  |   6 --
 umap/static/umap/test/index.html      |   1 -
 umap/templates/umap/content.html      |   2 +-
 umap/templates/umap/js.html           | 111 +++++++++++++-------------
 umap/templates/umap/map_fragment.html |   2 +-
 umap/templates/umap/map_init.html     |   2 +-
 7 files changed, 63 insertions(+), 68 deletions(-)
 delete mode 100644 umap/static/umap/js/modules/index.js

diff --git a/umap/static/umap/js/modules/global.js b/umap/static/umap/js/modules/global.js
index a9485375..51ba37d0 100644
--- a/umap/static/umap/js/modules/global.js
+++ b/umap/static/umap/js/modules/global.js
@@ -1,5 +1,8 @@
 import * as L from '../../vendors/leaflet/leaflet-src.esm.js'
+import URLs from './urls.js'
+// Import modules and export them to the global scope.
+// For the not yet module-compatible JS out there.
 
-// Exposes the modules to the window global scope, it's expected by leaflet plugins
-// in a writeable form.
+// Copy the leaflet module, it's expected by leaflet plugins to be writeable.
 window.L = { ...L }
+window.umap = { URLs }
diff --git a/umap/static/umap/js/modules/index.js b/umap/static/umap/js/modules/index.js
deleted file mode 100644
index c9f37269..00000000
--- a/umap/static/umap/js/modules/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import URLs from './urls.js'
-
-// expose the modules to the window.umap global scope
-window.umap = { URLs }
-
-export { URLs }
diff --git a/umap/static/umap/test/index.html b/umap/static/umap/test/index.html
index 0d643766..d809370f 100644
--- a/umap/static/umap/test/index.html
+++ b/umap/static/umap/test/index.html
@@ -29,7 +29,6 @@
     <script src="../vendors/iconlayers/iconLayers.js" defer></script>
     <script src="../vendors/simple-statistics/simple-statistics.min.js" defer></script>
     <script src="../vendors/colorbrewer/colorbrewer.js" defer></script>
-    <script type="module" src="../js/modules/index.js" defer></script>
     <script src="../js/umap.core.js" defer></script>
     <script src="../js/umap.autocomplete.js" defer></script>
     <script src="../js/umap.popup.js" defer></script>
diff --git a/umap/templates/umap/content.html b/umap/templates/umap/content.html
index 2dd3d64a..29cc8329 100644
--- a/umap/templates/umap/content.html
+++ b/umap/templates/umap/content.html
@@ -38,7 +38,7 @@
 {% block bottom_js %}
   {{ block.super }}
   <script type="text/javascript">
-    window.addEventListener('load', (event => {
+    window.addEventListener('DOMContentLoaded', (event => {
       
     !(function () {
       const ui = new L.U.UI(document.querySelector('header'))
diff --git a/umap/templates/umap/js.html b/umap/templates/umap/js.html
index b7498e3c..6f9cd75f 100644
--- a/umap/templates/umap/js.html
+++ b/umap/templates/umap/js.html
@@ -1,62 +1,61 @@
 {% load compress %}
 {% compress js %}
-  <script type="module" src="{{ STATIC_URL }}umap/js/modules/global.js" defer></script>
-  <script src="{{ STATIC_URL }}umap/vendors/editable/Path.Drag.js" defer></script>
-  <script src="{{ STATIC_URL }}umap/vendors/editable/Leaflet.Editable.js" defer></script>
-  <script src="{{ STATIC_URL }}umap/vendors/hash/leaflet-hash.js" defer></script>
-  <script src="{{ STATIC_URL }}umap/vendors/i18n/Leaflet.i18n.js" defer></script>
-  <script src="{{ STATIC_URL }}umap/vendors/editinosm/Leaflet.EditInOSM.js"
-          defer></script>
-  <script src="{{ STATIC_URL }}umap/vendors/minimap/Control.MiniMap.js" defer></script>
-  <script src="{{ STATIC_URL }}umap/vendors/csv2geojson/csv2geojson.js" defer></script>
-  <script src="{{ STATIC_URL }}umap/vendors/togeojson/togeojson.js" defer></script>
-  <script src="{{ STATIC_URL }}umap/vendors/osmtogeojson/osmtogeojson.js" defer></script>
-  <script src="{{ STATIC_URL }}umap/vendors/loading/Control.Loading.js" defer></script>
-  <script src="{{ STATIC_URL }}umap/vendors/markercluster/leaflet.markercluster-src.js"
-          defer></script>
-  <script src="{{ STATIC_URL }}umap/vendors/contextmenu/leaflet.contextmenu.js"
-          defer></script>
-  <script src="{{ STATIC_URL }}umap/vendors/photon/leaflet.photon.js" defer></script>
-  <script src="{{ STATIC_URL }}umap/vendors/georsstogeojson/GeoRSSToGeoJSON.js"
-          defer></script>
-  <script src="{{ STATIC_URL }}umap/vendors/heat/leaflet-heat.js" defer></script>
-  <script src="{{ STATIC_URL }}umap/vendors/fullscreen/Leaflet.fullscreen.js"
-          defer></script>
-  <script src="{{ STATIC_URL }}umap/vendors/toolbar/leaflet.toolbar-src.js"
-          defer></script>
-  <script src="{{ STATIC_URL }}umap/vendors/formbuilder/Leaflet.FormBuilder.js"
-          defer></script>
-  <script src="{{ STATIC_URL }}umap/vendors/measurable/Leaflet.Measurable.js"
-          defer></script>
-  <script src="{{ STATIC_URL }}umap/vendors/togpx/togpx.js" defer></script>
-  <script src="{{ STATIC_URL }}umap/vendors/iconlayers/iconLayers.js" defer></script>
-  <script src="{{ STATIC_URL }}umap/vendors/tokml/tokml.js" defer></script>
-  <script src="{{ STATIC_URL }}umap/vendors/locatecontrol/L.Control.Locate.js"
-          defer></script>
-  <script src="{{ STATIC_URL }}umap/vendors/dompurify/purify.js" defer></script>
-  <script src="{{ STATIC_URL }}umap/vendors/colorbrewer/colorbrewer.js" defer></script>
-  <script src="{{ STATIC_URL }}umap/vendors/simple-statistics/simple-statistics.min.js"
-          defer></script>
+        <script type="module" src="{{ STATIC_URL }}umap/js/modules/global.js" defer></script>
+        <script src="{{ STATIC_URL }}umap/vendors/editable/Path.Drag.js" defer></script>
+        <script src="{{ STATIC_URL }}umap/vendors/editable/Leaflet.Editable.js" defer></script>
+        <script src="{{ STATIC_URL }}umap/vendors/hash/leaflet-hash.js" defer></script>
+        <script src="{{ STATIC_URL }}umap/vendors/i18n/Leaflet.i18n.js" defer></script>
+        <script src="{{ STATIC_URL }}umap/vendors/editinosm/Leaflet.EditInOSM.js"
+                defer></script>
+        <script src="{{ STATIC_URL }}umap/vendors/minimap/Control.MiniMap.js" defer></script>
+        <script src="{{ STATIC_URL }}umap/vendors/csv2geojson/csv2geojson.js" defer></script>
+        <script src="{{ STATIC_URL }}umap/vendors/togeojson/togeojson.js" defer></script>
+        <script src="{{ STATIC_URL }}umap/vendors/osmtogeojson/osmtogeojson.js" defer></script>
+        <script src="{{ STATIC_URL }}umap/vendors/loading/Control.Loading.js" defer></script>
+        <script src="{{ STATIC_URL }}umap/vendors/markercluster/leaflet.markercluster-src.js"
+                defer></script>
+        <script src="{{ STATIC_URL }}umap/vendors/contextmenu/leaflet.contextmenu.js"
+                defer></script>
+        <script src="{{ STATIC_URL }}umap/vendors/photon/leaflet.photon.js" defer></script>
+        <script src="{{ STATIC_URL }}umap/vendors/georsstogeojson/GeoRSSToGeoJSON.js"
+                defer></script>
+        <script src="{{ STATIC_URL }}umap/vendors/heat/leaflet-heat.js" defer></script>
+        <script src="{{ STATIC_URL }}umap/vendors/fullscreen/Leaflet.fullscreen.js"
+                defer></script>
+        <script src="{{ STATIC_URL }}umap/vendors/toolbar/leaflet.toolbar-src.js"
+                defer></script>
+        <script src="{{ STATIC_URL }}umap/vendors/formbuilder/Leaflet.FormBuilder.js"
+                defer></script>
+        <script src="{{ STATIC_URL }}umap/vendors/measurable/Leaflet.Measurable.js"
+                defer></script>
+        <script src="{{ STATIC_URL }}umap/vendors/togpx/togpx.js" defer></script>
+        <script src="{{ STATIC_URL }}umap/vendors/iconlayers/iconLayers.js" defer></script>
+        <script src="{{ STATIC_URL }}umap/vendors/tokml/tokml.js" defer></script>
+        <script src="{{ STATIC_URL }}umap/vendors/locatecontrol/L.Control.Locate.js"
+                defer></script>
+        <script src="{{ STATIC_URL }}umap/vendors/dompurify/purify.js" defer></script>
+        <script src="{{ STATIC_URL }}umap/vendors/colorbrewer/colorbrewer.js" defer></script>
+        <script src="{{ STATIC_URL }}umap/vendors/simple-statistics/simple-statistics.min.js"
+                defer></script>
 {% endcompress %}
 {% if locale %}<script src="{{ STATIC_URL }}umap/locale/{{ locale }}.js" defer></script>{% endif %}
 {% compress js %}
-  <script type="module" src="{{ STATIC_URL }}umap/js/modules/index.js" defer></script>
-  <script src="{{ STATIC_URL }}umap/js/umap.core.js" defer></script>
-  <script src="{{ STATIC_URL }}umap/js/umap.autocomplete.js" defer></script>
-  <script src="{{ STATIC_URL }}umap/js/umap.popup.js" defer></script>
-  <script src="{{ STATIC_URL }}umap/js/umap.xhr.js" defer></script>
-  <script src="{{ STATIC_URL }}umap/js/umap.forms.js" defer></script>
-  <script src="{{ STATIC_URL }}umap/js/umap.icon.js" defer></script>
-  <script src="{{ STATIC_URL }}umap/js/umap.features.js" defer></script>
-  <script src="{{ STATIC_URL }}umap/js/umap.permissions.js" defer></script>
-  <script src="{{ STATIC_URL }}umap/js/umap.datalayer.permissions.js" defer></script>
-  <script src="{{ STATIC_URL }}umap/js/umap.layer.js" defer></script>
-  <script src="{{ STATIC_URL }}umap/js/umap.controls.js" defer></script>
-  <script src="{{ STATIC_URL }}umap/js/umap.slideshow.js" defer></script>
-  <script src="{{ STATIC_URL }}umap/js/umap.tableeditor.js" defer></script>
-  <script src="{{ STATIC_URL }}umap/js/umap.browser.js" defer></script>
-  <script src="{{ STATIC_URL }}umap/js/umap.importer.js" defer></script>
-  <script src="{{ STATIC_URL }}umap/js/umap.share.js" defer></script>
-  <script src="{{ STATIC_URL }}umap/js/umap.js" defer></script>
-  <script src="{{ STATIC_URL }}umap/js/umap.ui.js" defer></script>
+        <script src="{{ STATIC_URL }}umap/js/umap.core.js" defer></script>
+        <script src="{{ STATIC_URL }}umap/js/umap.autocomplete.js" defer></script>
+        <script src="{{ STATIC_URL }}umap/js/umap.popup.js" defer></script>
+        <script src="{{ STATIC_URL }}umap/js/umap.xhr.js" defer></script>
+        <script src="{{ STATIC_URL }}umap/js/umap.forms.js" defer></script>
+        <script src="{{ STATIC_URL }}umap/js/umap.icon.js" defer></script>
+        <script src="{{ STATIC_URL }}umap/js/umap.features.js" defer></script>
+        <script src="{{ STATIC_URL }}umap/js/umap.permissions.js" defer></script>
+        <script src="{{ STATIC_URL }}umap/js/umap.datalayer.permissions.js" defer></script>
+        <script src="{{ STATIC_URL }}umap/js/umap.layer.js" defer></script>
+        <script src="{{ STATIC_URL }}umap/js/umap.controls.js" defer></script>
+        <script src="{{ STATIC_URL }}umap/js/umap.slideshow.js" defer></script>
+        <script src="{{ STATIC_URL }}umap/js/umap.tableeditor.js" defer></script>
+        <script src="{{ STATIC_URL }}umap/js/umap.browser.js" defer></script>
+        <script src="{{ STATIC_URL }}umap/js/umap.importer.js" defer></script>
+        <script src="{{ STATIC_URL }}umap/js/umap.share.js" defer></script>
+        <script src="{{ STATIC_URL }}umap/js/umap.js" defer></script>
+        <script src="{{ STATIC_URL }}umap/js/umap.ui.js" defer></script>
 {% endcompress %}
diff --git a/umap/templates/umap/map_fragment.html b/umap/templates/umap/map_fragment.html
index 5ff40350..9aef37c9 100644
--- a/umap/templates/umap/map_fragment.html
+++ b/umap/templates/umap/map_fragment.html
@@ -3,7 +3,7 @@
 <!-- djlint:off -->
 <script type="text/javascript">
   // Wait for JS modules to be loaded
-  window.addEventListener('load', (event) => {
+  window.addEventListener('DOMContentLoaded', (event) => {
     new L.U.Map("{{ unique_id }}", {{ map_settings|notag|safe }})
   });
 </script>
diff --git a/umap/templates/umap/map_init.html b/umap/templates/umap/map_init.html
index c7e36560..61b8a6bc 100644
--- a/umap/templates/umap/map_init.html
+++ b/umap/templates/umap/map_init.html
@@ -2,7 +2,7 @@
 <div id="map"></div>
 <!-- djlint:off -->
 <script defer type="text/javascript">
-  window.addEventListener('load', (event) => {
+  window.addEventListener('DOMContentLoaded', (event) => {
     let MAP = new L.U.Map("map", {{ map_settings|notag|safe }});
   });
 </script>