Propagate abort to "child" promises

mjackson · Aug 18, 2014 · d55876a · d55876a
1 parent 6267ce0
commit d55876a
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/modules/utils/AbortablePromise.js b/modules/utils/AbortablePromise.js
@@ -45,8 +45,13 @@ function AbortablePromise(resolver) {
 
   var abortHandler, onAbort;
   var promise = new Promise(function (resolve, reject) {
-    resolver(function () {
-      abortHandler = null;
+    resolver(function (child) {
+      if (child && typeof child.abort === 'function') {
+        abortHandler = child.abort;
+      } else {
+        abortHandler = null;
+      }
+
       resolve.apply(this, arguments);
     }, function () {
       abortHandler = null;