Prevent rejecting the loop if the result cancelled itself

e187ad3f · Romain Courteaud · bfed7a73 · e187ad3f
Commit e187ad3f authored Mar 18, 2020 by Romain Courteaud
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

renderjs.js renderjs.js +8 -1

No files found.
--- a/renderjs.js
+++ b/renderjs.js
@@ -108,7 +108,14 @@
          return reject(e);
        }

-        callback_promise = new RSVP.Queue(result).push(undefined, reject);
+        callback_promise = new RSVP.Queue(result)
+          .push(undefined, function handleEventCallbackError(error) {
+            // Prevent rejecting the loop, if the result cancelled itself
+            if (!(error instanceof RSVP.CancellationError)) {
+              canceller();
+              reject(error);
+            }
+          });
      };

      target.addEventListener(type, handle_event_callback, useCapture);