Merge pull request #348 from jsperezg/fix_loading_issues

Fix uncatched exception when loading google maps api.

Author: auser

src/lib/ScriptCache.js

@@ -5,7 +5,7 @@ const window = require('./windowOrGlobal');
 export const ScriptCache = (function(global) {
     global._scriptMap = global._scriptMap || scriptMap;
     return function ScriptCache(scripts) {
-        const Cache = {}
+        const Cache = {};
 
         Cache._onLoad = function(key) {
             return (cb) => {
@@ -24,14 +24,14 @@ export const ScriptCache = (function(global) {
                         }
 
                         return stored;
-                    });
+                    }).catch(error => cb(error));
                 } else {
                     // TODO:
                 }
 
                 return unregister;
             }
-        }
+        };
 
         Cache._scriptTag = (key, src) => {
             if (!scriptMap.has(key)) {
@@ -41,9 +41,7 @@ export const ScriptCache = (function(global) {
 
                 let tag = document.createElement('script');
                 let promise = new Promise((resolve, reject) => {
-                    let resolved = false,
-                        errored = false,
-                        body = document.getElementsByTagName('body')[0];
+                    let body = document.getElementsByTagName('body')[0];
 
                     tag.type = 'text/javascript';
                     tag.async = false; // Load in order
@@ -69,24 +67,24 @@ export const ScriptCache = (function(global) {
 
                             cleanup();
                         }
-                    }
+                    };
 
                     const cleanup = () => {
                         if (global[cbName] && typeof global[cbName] === 'function') {
                             global[cbName] = null;
                             delete global[cbName]
                         }
-                    }
+                    };
 
                     tag.onload = handleResult('loaded');
-                    tag.onerror = handleResult('error')
+                    tag.onerror = handleResult('error');
                     tag.onreadystatechange = () => {
                         handleResult(tag.readyState)
-                    }
+                    };
 
                     // Pick off callback, if there is one
                     if (src.match(/callback=CALLBACK_NAME/)) {
-                        src = src.replace(/(callback=)[^\&]+/, `$1${cbName}`)
+                        src = src.replace(/(callback=)[^\&]+/, `$1${cbName}`);
                         cb = window[cbName] = tag.onload;
                     } else {
                         tag.addEventListener('load', tag.onload)
@@ -101,13 +99,13 @@ export const ScriptCache = (function(global) {
                 let initialState = {
                     loaded: false,
                     error: false,
-                    promise: promise,
+                    promise,
                     tag
-                }
+                };
                 scriptMap.set(key, initialState);
             }
-            return scriptMap.get(key);
-        }
+            return scriptMap.get(key).tag;
+        };
 
         // let scriptTags = document.querySelectorAll('script')
         //
@@ -132,7 +130,7 @@ export const ScriptCache = (function(global) {
                 tag: tag,
                 onLoad: Cache._onLoad(key),
             }
-        })
+        });
 
         return Cache;
     }