erp5_core: fix cancellation handling

4117826b · Romain Courteaud · Xiaowu Zhang · 0c1b8d7d · 4117826b
Commit 4117826b authored Feb 27, 2020 by Romain Courteaud Committed by Xiaowu Zhang Apr 06, 2020
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 12 deletions

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/gadget_global.js.js ...inTemplateItem/portal_skins/erp5_core/gadget_global.js.js +2 -12

No files found.
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/gadget_global.js.js
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/gadget_global.js.js
@@ -101,20 +101,10 @@
        try {
          result = callback(evt);
        } catch (e) {
-          result = RSVP.reject(e);
+          return reject(e);
        }
-        callback_promise = result;
+        callback_promise = new RSVP.Queue(result).push(undefined, reject);
-        new RSVP.Queue()
-          .push(function () {
-            return result;
-          })
-          .push(undefined, function (error) {
-            if (!(error instanceof RSVP.CancellationError)) {
-              canceller();
-              reject(error);
-            }
-          });
      };
      target.addEventListener(type, handle_event_callback, useCapture);