Fixed duplication of script requests due to a race condition while lo…

…ading dependencies.
Meesayen · Sep 21, 2015 · 9b2aed0 · 9b2aed0
1 parent f25b6e9
commit 9b2aed0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/client.js b/client.js
@@ -26,6 +26,7 @@ function normalizeName(child, parentBase) {
 }
 
 var seen = Object.create(null);
+var pendingPromises = Object.create(null);
 var internalRegistry = Object.create(null);
 var externalRegistry = Object.create(null);
 var anonymousEntry;
@@ -74,7 +75,10 @@ function createScriptNode(src, callback) {
 }
 
 function load(name) {
-    return new Promise(function(resolve, reject) {
+    if (pendingPromises[name]) {
+        return pendingPromises[name];
+    }
+    pendingPromises[name] = new Promise(function(resolve, reject) {
         createScriptNode((System.baseURL || '/') + name + '.js', function(err) {
             if (anonymousEntry) {
                 System.register(name, anonymousEntry[0], anonymousEntry[1]);
@@ -93,6 +97,7 @@ function load(name) {
             })).then(resolve, reject);
         });
     });
+    return pendingPromises[name];
 }
 
 

diff --git a/dist/system-polyfill.js b/dist/system-polyfill.js
@@ -26,6 +26,7 @@ function normalizeName(child, parentBase) {
 }
 
 var seen = Object.create(null);
+var pendingPromises = Object.create(null);
 var internalRegistry = Object.create(null);
 var externalRegistry = Object.create(null);
 var anonymousEntry;
@@ -74,7 +75,10 @@ function createScriptNode(src, callback) {
 }
 
 function load(name) {
-    return new Promise(function(resolve, reject) {
+    if (pendingPromises[name]) {
+        return pendingPromises[name];
+    }
+    pendingPromises[name] = new Promise(function(resolve, reject) {
         createScriptNode((System.baseURL || '/') + name + '.js', function(err) {
             if (anonymousEntry) {
                 System.register(name, anonymousEntry[0], anonymousEntry[1]);
@@ -93,6 +97,7 @@ function load(name) {
             })).then(resolve, reject);
         });
     });
+    return pendingPromises[name];
 }
 
 

diff --git a/dist/system-polyfill.min.js b/dist/system-polyfill.min.js