To close issue GoogleWebComponents#70 GoogleWebComponents#70

lcaggio · Jun 1, 2016 · e976e50 · e976e50
1 parent 1e2d574
commit e976e50
Showing 1 changed file with 22 additions and 3 deletions.
diff --git a/google-client-loader.html b/google-client-loader.html
@@ -112,12 +112,25 @@
         errorEventName: {
           type: String,
           value: 'google-api-load-error'
+        },
+
+        _clientLoaded: {
+          type: Boolean,
+          value: false
+        },
+
+        // Used to fix events potentially being fired multiple times by
+        // iron-jsonp-library.
+        _waiting: {
+          type: Boolean,
+          value: false
         }
+
       },
 
-      // Used to fix events potentially being fired multiple times by
-      // iron-jsonp-library.
-      _waiting: false,
+      observers: [
+        '_tryLoadingApi(_waiting, _clientLoaded, name, version)'
+      ],
 
       /**
        * Returns the loaded API.
@@ -172,6 +185,7 @@
 
       _doneLoadingClient: function() {
         _clientLoaded = true;
+        this._clientLoaded = true;
         // Fix for API client load event being fired multiple times by
         // iron-jsonp-library.
         if (!this._waiting) {
@@ -188,6 +202,11 @@
         return handler;
       },
 
+      _tryLoadingApi: function(waiting, clientLoaded, name, version) {
+        if (!waiting && clientLoaded && name && version)
+          this._loadApi();
+      },
+
       _loadApi: function() {
         if (_clientLoaded && this.name && this.version) {
           this._waiting = false;