jodit 4.7.4 → 4.7.5

package/es2015/jodit.js

@@ -1,7 +1,7 @@
 /*!
  * jodit - Jodit is an awesome and useful wysiwyg editor with filebrowser
  * Author: Chupurnov <chupurnov@gmail.com> (https://xdsoft.net/jodit/)
- * Version: v4.7.4
+ * Version: v4.7.5
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -8463,10 +8463,11 @@ module.exports = "<svg xmlns='http://www.w3.org/2000/svg' viewBox=\"0 0 1792 179
  */ const FileSelectorWidget = (editor, callbacks, elm, close, isImage = true)=>{
     let currentImage;
     const tabs = [];
-    if (callbacks.upload && editor.o.uploader && (editor.o.uploader.url || editor.o.uploader.insertImageAsBase64URI)) {
+    const options = editor.o.uploader;
+    if (callbacks.upload && (options.url || options.insertImageAsBase64URI || options.customUploadFunction)) {
         const dragBox = editor.c.fromHTML('<div class="jodit-drag-and-drop__file-box">' + `<strong>${editor.i18n(isImage ? 'Drop image' : 'Drop file')}</strong>` + `<span><br>${editor.i18n('or click')}</span>` + `<input type="file" accept="${isImage ? 'image/*' : '*'}" tabindex="-1" dir="auto" multiple=""/>` + '</div>');
         editor.uploader.bind(dragBox, (resp)=>{
-            const handler = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_1__.isFunction)(callbacks.upload) ? callbacks.upload : editor.o.uploader.defaultHandlerSuccess;
+            const handler = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_1__.isFunction)(callbacks.upload) ? callbacks.upload : options.defaultHandlerSuccess;
             if ((0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_1__.isFunction)(handler)) {
                 handler.call(editor, resp);
             }
@@ -33050,24 +33051,27 @@ function ConfigFlatten(obj) {
 const ajaxInstances = new WeakMap();
 function send(uploader, data) {
     const requestData = (0,jodit_modules_uploader_helpers_build_data__WEBPACK_IMPORTED_MODULE_2__.buildData)(uploader, data);
-    const sendData = (request)=>{
+    const showProgress = (progress)=>{
+        uploader.j.progressbar.show().progress(progress);
+        if (progress >= 100) {
+            uploader.j.progressbar.hide();
+        }
+    };
+    let sendData = (request, showProgress)=>{
         const ajax = new jodit_core_request__WEBPACK_IMPORTED_MODULE_1__.Ajax({
             xhr: ()=>{
                 const xhr = new XMLHttpRequest();
                 if (uploader.j.ow.FormData !== undefined && xhr.upload) {
-                    uploader.j.progressbar.show().progress(10);
+                    showProgress(10);
                     xhr.upload.addEventListener('progress', (evt)=>{
                         if (evt.lengthComputable) {
                             let percentComplete = evt.loaded / evt.total;
                             percentComplete *= 100;
-                            uploader.j.progressbar.show().progress(percentComplete);
-                            if (percentComplete >= 100) {
-                                uploader.j.progressbar.hide();
-                            }
+                            showProgress(percentComplete);
                         }
                     }, false);
                 } else {
-                    uploader.j.progressbar.hide();
+                    showProgress(100);
                 }
                 return xhr;
             },
@@ -33100,12 +33104,15 @@ function send(uploader, data) {
             instances === null || instances === void 0 ? void 0 : instances.delete(ajax);
         });
     };
+    if ((0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_0__.isFunction)(uploader.o.customUploadFunction)) {
+        sendData = uploader.o.customUploadFunction;
+    }
     if ((0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_0__.isPromise)(requestData)) {
-        return requestData.then(sendData).catch((error)=>{
+        return requestData.then((data)=>sendData(data, showProgress)).catch((error)=>{
             uploader.o.error.call(uploader, error);
         });
     }
-    return sendData(requestData);
+    return sendData(requestData, showProgress);
 }
 
 
@@ -34623,7 +34630,7 @@ __webpack_require__.r(__webpack_exports__);
  * ```
  * @packageDocumentation
  * @module constants
- */ const APP_VERSION = "4.7.4";
+ */ const APP_VERSION = "4.7.5";
 // prettier-ignore
 const ES = "es2015";
 const IS_ES_MODERN = true;