Fix: Fix a timing issue for sequential importLibrary calls (#843)

#809 Fixes #809 f24a1ae
googlemaps · Apr 26, 2024 · b8d3c8e · b8d3c8e
1 parent 2c490bb
commit b8d3c8e
Show file tree

Hide file tree

Showing 12 changed files with 55 additions and 52 deletions.
diff --git a/classes/Loader.html b/classes/Loader.html
diff --git a/dist/index.dev.js b/dist/index.dev.js
@@ -422,19 +422,21 @@ this.google.maps.plugins.loader = (function (exports) {
       }
       execute() {
         this.resetIfRetryingFailed();
+        if (this.loading) {
+          // do nothing but wait
+          return;
+        }
         if (this.done) {
           this.callback();
         } else {
           // short circuit and warn if google.maps is already loaded
           if (window.google && window.google.maps && window.google.maps.version) {
-            console.warn("Google Maps already loaded outside @googlemaps/js-api-loader." + "This may result in undesirable behavior as options and script parameters may not match.");
+            console.warn("Google Maps already loaded outside @googlemaps/js-api-loader. " + "This may result in undesirable behavior as options and script parameters may not match.");
             this.callback();
             return;
           }
-          if (this.loading) ; else {
-            this.loading = true;
-            this.setScript();
-          }
+          this.loading = true;
+          this.setScript();
         }
       }
     }

diff --git a/dist/index.min.js b/dist/index.min.js
diff --git a/dist/index.mjs b/dist/index.mjs
@@ -385,22 +385,23 @@ class Loader {
     }
     execute() {
         this.resetIfRetryingFailed();
+        if (this.loading) {
+            // do nothing but wait
+            return;
+        }
         if (this.done) {
             this.callback();
         }
         else {
             // short circuit and warn if google.maps is already loaded
             if (window.google && window.google.maps && window.google.maps.version) {
-                console.warn("Google Maps already loaded outside @googlemaps/js-api-loader." +
+                console.warn("Google Maps already loaded outside @googlemaps/js-api-loader. " +
                     "This may result in undesirable behavior as options and script parameters may not match.");
                 this.callback();
                 return;
             }
-            if (this.loading) ;
-            else {
-                this.loading = true;
-                this.setScript();
-            }
+            this.loading = true;
+            this.setScript();
         }
     }
 }

diff --git a/dist/index.mjs.map b/dist/index.mjs.map