erp5_xhtml_style: ckeditor: fix cancellation issue

product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_ckeditor/ckeditor.gadget.html.html

@@ -10,6 +10,7 @@
 
     <!-- This gadget provides ckeditor with all Plugins activated by default -->
     <!-- Make sure to check the timestamp of your CKEditor version in order to update the manifest -->
+    <script src="gadget_global.js"></script>
     <script src="ckeditor/ckeditor.js"></script>
     <script src="ckeditor.gadget.js" type="text/javascript"></script>
 

product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_ckeditor/ckeditor.gadget.js.js

@@ -44,20 +44,10 @@
         try {
           result = callback(evt);
         } catch (e) {
-          result = RSVP.reject(e);
+          return reject(e);
         }
 
-        callback_promise = result;
-        new RSVP.Queue()
-          .push(function () {
-            return result;
-          })
-          .push(undefined, function (error) {
-            if (!(error instanceof RSVP.CancellationError)) {
-              canceller();
-              reject(error);
-            }
-          });
+        callback_promise = new RSVP.Queue(result).push(undefined, reject);
       };
 
       target.addEventListener(type, handle_event_callback, useCapture);