jodit 4.7.4 → 4.7.5

package/es5/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
  */
@@ -9629,10 +9629,11 @@ module.exports = "<svg xmlns='http://www.w3.org/2000/svg' viewBox=\"0 0 1792 179
     var isImage = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : true;
     var currentImage;
     var tabs = [];
-    if (callbacks.upload && editor.o.uploader && (editor.o.uploader.url || editor.o.uploader.insertImageAsBase64URI)) {
+    var options = editor.o.uploader;
+    if (callbacks.upload && (options.url || options.insertImageAsBase64URI || options.customUploadFunction)) {
         var dragBox = editor.c.fromHTML('<div class="jodit-drag-and-drop__file-box">' + "<strong>".concat(editor.i18n(isImage ? 'Drop image' : 'Drop file'), "</strong>") + "<span><br>".concat(editor.i18n('or click'), "</span>") + '<input type="file" accept="'.concat(isImage ? 'image/*' : '*', '" tabindex="-1" dir="auto" multiple=""/>') + '</div>');
         editor.uploader.bind(dragBox, function(resp) {
-            var handler = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_1__.isFunction)(callbacks.upload) ? callbacks.upload : editor.o.uploader.defaultHandlerSuccess;
+            var 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);
             }
@@ -38932,24 +38933,27 @@ function ConfigFlatten(obj) {
 var ajaxInstances = new WeakMap();
 function send(uploader, data) {
     var requestData = (0,jodit_modules_uploader_helpers_build_data__WEBPACK_IMPORTED_MODULE_2__.buildData)(uploader, data);
-    var sendData = function(request) {
+    var showProgress = function(progress) {
+        uploader.j.progressbar.show().progress(progress);
+        if (progress >= 100) {
+            uploader.j.progressbar.hide();
+        }
+    };
+    var sendData = function(request, showProgress) {
         var ajax = new jodit_core_request__WEBPACK_IMPORTED_MODULE_1__.Ajax({
             xhr: function() {
                 var xhr = new XMLHttpRequest();
                 if (uploader.j.ow.FormData !== undefined && xhr.upload) {
-                    uploader.j.progressbar.show().progress(10);
+                    showProgress(10);
                     xhr.upload.addEventListener('progress', function(evt) {
                         if (evt.lengthComputable) {
                             var 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;
             },
@@ -38984,12 +38988,17 @@ 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(function(error) {
+        return requestData.then(function(data) {
+            return sendData(data, showProgress);
+        }).catch(function(error) {
             uploader.o.error.call(uploader, error);
         });
     }
-    return sendData(requestData);
+    return sendData(requestData, showProgress);
 }
 
 
@@ -40676,7 +40685,7 @@ __webpack_require__.r(__webpack_exports__);
  * @packageDocumentation
  * @module constants
  */ 
-var APP_VERSION = "4.7.4";
+var APP_VERSION = "4.7.5";
 // prettier-ignore
 var ES = "es5";
 var IS_ES_MODERN = false;

package/es5/jodit.min.css

@@ -1,14 +1,14 @@
 /*!
  * 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
  */
 	/*!
  * 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
  */