promy join and choose cancels promises when cancel method exist

c57590e1 · Tristan Cavelier · 60e79a08 · c57590e1
Commit c57590e1 authored Sep 16, 2013 by Tristan Cavelier
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

src/promy/promy.js src/promy/promy.js +6 -2

No files found.
--- a/src/promy/promy.js
+++ b/src/promy/promy.js
@@ -642,7 +642,9 @@
    function cancel() {
      var j;
      for (j = 0; j < promises.length; j += 1) {
-        promises[j].cancel();
+        if (typeof promises[j].cancel === 'function') {
+          promises[j].cancel();
+        }
      }
    }
    deferred = new Deferred(cancel);
@@ -691,7 +693,9 @@
    function cancel() {
      var j;
      for (j = 0; j < promises.length; j += 1) {
-        promises[j].cancel();
+        if (typeof promises[j].cancel === 'function') {
+          promises[j].cancel();
+        }
      }
    }
    deferred = new Deferred(cancel);