refactor(templates): Moving resolve script into navigation header

Signed-off-by: Vincent Boutour <[email protected]>
ViBiOh · Jul 27, 2022 · 2dda356 · 2dda356
1 parent 6de5952
commit 2dda356
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 37 deletions.
diff --git a/cmd/fibr/templates/async-image.html b/cmd/fibr/templates/async-image.html
@@ -38,24 +38,6 @@
       picture.alt = 'Image file';
     }
 
-    function resolveScript(src, integrity, crossorigin) {
-      return new Promise((resolve, reject) => {
-        const script = document.createElement('script');
-        script.type = 'text/javascript';
-        script.src = src;
-        script.async = 'true';
-        script.onload = resolve.bind(null, true);
-        script.onerror = reject.bind(null, true);
-
-        if (integrity) {
-          script.integrity = integrity;
-          script.crossOrigin = crossorigin;
-        }
-
-        document.querySelector('head').appendChild(script);
-      });
-    }
-
     resolveScript('/scripts/modern_detection.js?v={{ .Version }}')
       .then(() => {
         if (window.modernBrowser) {

diff --git a/cmd/fibr/templates/map-modal.html b/cmd/fibr/templates/map-modal.html
@@ -91,28 +91,11 @@ <h2>You must enable Javascript to have interactive map with pictures.</h2>
           });
         }
 
-        async function addScript(src, integrity, crossorigin) {
-          return new Promise((resolve) => {
-            const script = document.createElement('script');
-            script.type = 'text/javascript';
-            script.src = src;
-            script.async = 'true';
-            script.onload = resolve;
-
-            if (integrity) {
-              script.integrity = integrity;
-              script.crossOrigin = crossorigin;
-            }
-
-            document.querySelector('head').appendChild(script);
-          });
-        }
-
         async function loadLeaflet() {
           await addStyle('https://unpkg.com/[email protected]/dist/leaflet.css', 'sha512-hoalWLoI8r4UszCkZ5kL8vayOGVae1oxXe/2A4AO6J9+580uKHDO3JdHb7NzwwzK5xr/Fs0W40kiNHxM9vyTtQ==', '');
           await addStyle('https://unpkg.com/[email protected]/dist/MarkerCluster.Default.css', '', '');
-          await addScript('https://unpkg.com/[email protected]/dist/leaflet.js', 'sha512-BB3hKbKWOc9Ez/TAwyWxNXeoV9c1v6FIeYiBieIWkpLjauysF18NzgR1MBNBXf8/KABdlkX68nAhlwcDFLGPCQ==', '');
-          await addScript('https://unpkg.com/[email protected]/dist/leaflet.markercluster.js', '', '');
+          await resolveScript('https://unpkg.com/[email protected]/dist/leaflet.js', 'sha512-BB3hKbKWOc9Ez/TAwyWxNXeoV9c1v6FIeYiBieIWkpLjauysF18NzgR1MBNBXf8/KABdlkX68nAhlwcDFLGPCQ==', '');
+          await resolveScript('https://unpkg.com/[email protected]/dist/leaflet.markercluster.js', '', '');
         }
 
         let map;

diff --git a/cmd/fibr/templates/navigation.html b/cmd/fibr/templates/navigation.html
@@ -43,6 +43,31 @@
       {{ end }}
     }
 
+    /**
+     * Async loading of a script
+     * @param {String} src         URL of script
+     * @param {String} integrity   Integrity of script
+     * @param {String} crossorigin Crossorigin of script
+     * @return Promise when script is either loaded or on error
+     */
+    function resolveScript(src, integrity, crossorigin) {
+      return new Promise((resolve, reject) => {
+        const script = document.createElement('script');
+        script.type = 'text/javascript';
+        script.src = src;
+        script.async = 'true';
+        script.onload = resolve.bind(null, true);
+        script.onerror = reject.bind(null, true);
+
+        if (integrity) {
+          script.integrity = integrity;
+          script.crossOrigin = crossorigin;
+        }
+
+        document.querySelector('head').appendChild(script);
+      });
+    }
+
     /**
      * Handle Previous/next.
      */