jodit-pro 4.16.2 → 4.16.4

package/es5/jodit.js

@@ -1,7 +1,7 @@
 /*!
  * jodit-pro - PRO Version of Jodit Editor
  * Author: Chupurnov Valerii <chupurnov@gmail.com>
- * Version: v4.16.2
+ * Version: v4.16.4
  * Url: https://xdsoft.net/jodit/pro/
  * License(s): SEE LICENSE IN LICENSE.md
  */
@@ -2308,7 +2308,7 @@ function _unsupported_iterable_to_array(o, minLen) {
     if (n === "Map" || n === "Set") return Array.from(n);
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
-var APP_VERSION = "4.16.2";
+var APP_VERSION = "4.16.4";
 // prettier-ignore
 var ES = "es5";
 var IS_ES_MODERN = false;
@@ -43935,7 +43935,8 @@ _core_ui_index_js__WEBPACK_IMPORTED_MODULE_2__.Icon.set('palette', _palette_svg_
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   FileSelectorWidget: function() { return /* binding */ FileSelectorWidget; }
+/* harmony export */   FileSelectorWidget: function() { return /* binding */ FileSelectorWidget; },
+/* harmony export */   UploadTab: function() { return /* binding */ UploadTab; }
 /* harmony export */ });
 /* harmony import */ var _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2748);
 /* harmony import */ var _core_helpers_index_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(21537);
@@ -43963,22 +43964,19 @@ _core_ui_index_js__WEBPACK_IMPORTED_MODULE_2__.Icon.set('palette', _palette_svg_
     var tabs = [];
     var options = editor.o.uploader;
     if (callbacks.upload && options.showTabInFileSelector !== false && (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,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_1__.isFunction)(callbacks.upload) ? callbacks.upload : options.defaultHandlerSuccess;
+        var upload = callbacks.upload;
+        tabs.push(UploadTab(editor, function(resp) {
+            var handler = (0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_1__.isFunction)(upload) ? upload : options.defaultHandlerSuccess;
             if ((0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_1__.isFunction)(handler)) {
                 handler.call(editor, resp);
             }
-            editor.e.fire('closeAllPopups');
-        }, function(error) {
-            editor.message.error(error.message);
-            editor.e.fire('closeAllPopups');
-        });
-        tabs.push({
-            icon: 'upload',
-            name: 'Upload',
-            content: dragBox
-        });
+        }, isImage ? {
+            label: 'Drop image',
+            accept: 'image/*'
+        } : {
+            label: 'Drop file',
+            accept: '*'
+        }));
     }
     if (callbacks.filebrowser) {
         if (editor.o.filebrowser.ajax.url || editor.o.filebrowser.items.url) {
@@ -44046,6 +44044,25 @@ _core_ui_index_js__WEBPACK_IMPORTED_MODULE_2__.Icon.set('palette', _palette_svg_
     box.classList.add('jodit-file-selector');
     return box;
 };
+/**
+ * The Upload tab: a box that uploads the files dropped on it or chosen in its
+ * file input, then passes the uploader's answer to `onSuccess` and closes the popup
+ */ var UploadTab = function UploadTab(editor, onSuccess, param) {
+    var label = param.label, accept = param.accept;
+    var dragBox = editor.c.fromHTML('<div class="jodit-drag-and-drop__file-box">' + "<strong>".concat(editor.i18n(label), "</strong>") + "<span><br>".concat(editor.i18n('or click'), "</span>") + '<input type="file" accept="'.concat(accept, '" tabindex="-1" dir="auto" multiple=""/>') + '</div>');
+    editor.uploader.bind(dragBox, function(resp) {
+        onSuccess.call(editor, resp);
+        editor.e.fire('closeAllPopups');
+    }, function(error) {
+        editor.message.error(error.message);
+        editor.e.fire('closeAllPopups');
+    });
+    return {
+        icon: 'upload',
+        name: 'Upload',
+        content: dragBox
+    };
+};
 function val(elm, name, value) {
     var child = _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_0__.Dom.first(elm, function(node) {
         return _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_0__.Dom.isTag(node, 'input') && (0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_1__.attr)(node, 'name') === name;
@@ -44068,7 +44085,8 @@ function val(elm, name, value) {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   ColorPickerWidget: function() { return /* reexport safe */ _color_picker_color_picker_js__WEBPACK_IMPORTED_MODULE_0__.ColorPickerWidget; },
 /* harmony export */   FileSelectorWidget: function() { return /* reexport safe */ _file_selector_file_selector_js__WEBPACK_IMPORTED_MODULE_1__.FileSelectorWidget; },
-/* harmony export */   TabsWidget: function() { return /* reexport safe */ _tabs_tabs_js__WEBPACK_IMPORTED_MODULE_2__.TabsWidget; }
+/* harmony export */   TabsWidget: function() { return /* reexport safe */ _tabs_tabs_js__WEBPACK_IMPORTED_MODULE_2__.TabsWidget; },
+/* harmony export */   UploadTab: function() { return /* reexport safe */ _file_selector_file_selector_js__WEBPACK_IMPORTED_MODULE_1__.UploadTab; }
 /* harmony export */ });
 /* harmony import */ var _color_picker_color_picker_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(22859);
 /* harmony import */ var _file_selector_file_selector_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(34793);
@@ -51899,6 +51917,20 @@ function brBefore(start) {
 
 
 
+function insertLinks(data) {
+    var _this = this;
+    var _a;
+    (_a = data.files) === null || _a === void 0 ? void 0 : _a.forEach(function(file) {
+        var link = _this.createInside.element('a', {
+            href: data.baseurl + file
+        });
+        link.textContent = _this.o.uploader.getDisplayName.call(_this.uploader, data.baseurl, file);
+        _this.s.insertNode(link);
+    });
+}
+_config_js__WEBPACK_IMPORTED_MODULE_3__.Config.prototype.file = {
+    defaultHandlerSuccess: insertLinks
+};
 _config_js__WEBPACK_IMPORTED_MODULE_3__.Config.prototype.controls.file = {
     popup: function popup(editor, current, close) {
         var insert = function insert(url) {
@@ -51916,7 +51948,10 @@ _config_js__WEBPACK_IMPORTED_MODULE_3__.Config.prototype.controls.file = {
                 });
                 close();
             },
-            upload: true,
+            upload: function upload(data) {
+                var _a, _b;
+                ((_b = (_a = editor.o.file) === null || _a === void 0 ? void 0 : _a.defaultHandlerSuccess) !== null && _b !== void 0 ? _b : insertLinks).call(editor, data);
+            },
             url: function url(url, text) {
                 if (sourceAnchor) {
                     (0,_core_helpers_utils_attr_js__WEBPACK_IMPORTED_MODULE_2__.attr)(sourceAnchor, 'href', url);
@@ -57415,6 +57450,26 @@ function _unsupported_iterable_to_array(o, minLen) {
 var alignClasses = function alignClasses(editor, elm) {
     return _core_dom_index_js__WEBPACK_IMPORTED_MODULE_0__.Dom.isTag(elm, 'img') ? editor.o.imageAlignClasses : null;
 };
+// A Normal image sits where the text of its line is aligned (#1531)
+var lineAlign = function lineAlign(editor, elm) {
+    var block = elm && _core_dom_index_js__WEBPACK_IMPORTED_MODULE_0__.Dom.closest(elm, _core_dom_index_js__WEBPACK_IMPORTED_MODULE_0__.Dom.isBlock, editor.editor) || editor.editor;
+    var rtl = (0,_core_helpers_utils_css_js__WEBPACK_IMPORTED_MODULE_3__.css)(block, 'direction') === 'rtl';
+    switch((0,_core_helpers_utils_css_js__WEBPACK_IMPORTED_MODULE_3__.css)(block, 'text-align')){
+        case 'center':
+        case '-webkit-center':
+            return 'center';
+        case 'justify':
+            return 'justify';
+        case 'right':
+            return 'right';
+        case 'end':
+            return rtl ? 'left' : 'right';
+        case 'start':
+            return rtl ? 'right' : 'left';
+        default:
+            return 'left';
+    }
+};
 var currentAlign = function currentAlign(editor, elm) {
     return elm ? (0,_core_helpers_utils_align_js__WEBPACK_IMPORTED_MODULE_2__.getHAlign)(elm, alignClasses(editor, elm)) : 'normal';
 };
@@ -57431,7 +57486,7 @@ var align = {
     ],
     update: function update(editor, button) {
         var current = currentAlign(editor, button.target);
-        button.state.icon.name = current === 'normal' ? 'left' : current;
+        button.state.icon.name = current === 'normal' ? lineAlign(editor, button.target) : current;
     },
     isActive: function isActive(editor, button) {
         return currentAlign(editor, button.target) !== 'normal';
@@ -68114,7 +68169,8 @@ var AceEditor = /*#__PURE__*/ function(SourceEditor) {
                         }
                         return;
                     }
-                    _this.fromWYSIWYG();
+                    // The source plugin carries the fallback editor's text over when this
+                    // one is ready; refilling from WYSIWYG here would drop unsynced typing
                     tryInitAceEditor();
                 };
                 editor.e.on('afterSetMode', initAceEditor);
@@ -68770,6 +68826,10 @@ function _wrap_native_super(Class) {
         ];
         _this.__lock = false;
         _this.__oldMirrorValue = '';
+        /**
+         * What the source view was last filled with from WYSIWYG, read back from
+         * the editor; while the view still holds it, nothing has been typed there
+         */ _this.__filledValue = '';
         _this.tempMarkerStart = '{start-jodit-selection}';
         _this.tempMarkerStartReg = /{start-jodit-selection}/g;
         _this.tempMarkerEnd = '{end-jodit-selection}';
@@ -68809,6 +68869,7 @@ function _wrap_native_super(Class) {
                     if (new_value !== this.getMirrorValue()) {
                         this.setMirrorValue(new_value);
                     }
+                    this.__filledValue = this.getMirrorValue();
                     this.__lock = false;
                 }
             }
@@ -69027,9 +69088,9 @@ function _wrap_native_super(Class) {
                                 return;
                             }
                             loading = true;
-                            // It formats the source view from the next time it opens:
-                            // filling it again now would replace what was typed there
-                            (0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_4__.loadNext)(editor, editor.o.beautifyHTMLCDNUrlsJS).then(addEventListener, function() {
+                            (0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_4__.loadNext)(editor, editor.o.beautifyHTMLCDNUrlsJS).then(function() {
+                                addEventListener() && _this.beautifyUntouched();
+                            }, function() {
                                 return null;
                             });
                         };
@@ -69059,11 +69120,9 @@ function _wrap_native_super(Class) {
                 if (editor.o.sourceEditor !== 'area') {
                     var sourceEditor = (0,_editor_factory_js__WEBPACK_IMPORTED_MODULE_7__.createSourceEditor)(editor.o.sourceEditor, editor, this.mirrorContainer, this.toWYSIWYG, this.fromWYSIWYG);
                     sourceEditor.onReadyAlways(function() {
-                        var _a, _b;
-                        (_a = _this.sourceEditor) === null || _a === void 0 ? void 0 : _a.destruct();
-                        _this.sourceEditor = sourceEditor;
-                        _this.syncValueFromWYSIWYG(true);
-                        (_b = editor.events) === null || _b === void 0 ? void 0 : _b.fire('sourceEditorReady', editor);
+                        var _a;
+                        _this.takeOver(sourceEditor);
+                        (_a = editor.events) === null || _a === void 0 ? void 0 : _a.fire('sourceEditorReady', editor);
                     });
                 } else {
                     (_a = this.sourceEditor) === null || _a === void 0 ? void 0 : _a.onReadyAlways(function() {
@@ -69074,6 +69133,55 @@ function _wrap_native_super(Class) {
                 }
             }
         },
+        {
+            /**
+     * Replaces the source editor (the textarea shown while ACE loads) with
+     * the one that just became ready, carrying its text, selection and focus
+     * over. Filling the new editor from WYSIWYG instead would drop what was
+     * typed since the last, debounced, sync and normalise half-typed markup.
+     */ key: "takeOver",
+            value: function takeOver(sourceEditor) {
+                var previous = this.sourceEditor;
+                if (!previous || previous === sourceEditor) {
+                    this.sourceEditor = sourceEditor;
+                    this.syncValueFromWYSIWYG(true);
+                    return;
+                }
+                var value = previous.getValue(), start = previous.getSelectionStart(), end = previous.getSelectionEnd(), focused = previous.isFocused, untouched = value === this.__filledValue;
+                previous.destruct();
+                this.sourceEditor = sourceEditor;
+                if (untouched) {
+                    this.syncValueFromWYSIWYG(true);
+                } else {
+                    sourceEditor.setValue(value);
+                    this.toWYSIWYG();
+                }
+                if (start >= 0) {
+                    sourceEditor.setSelectionRange(start, end);
+                }
+                focused && sourceEditor.focus();
+            }
+        },
+        {
+            /**
+     * The beautifier arrived after the source view was opened: format the
+     * view if nothing has been typed into it, otherwise leave the typing alone
+     */ key: "beautifyUntouched",
+            value: function beautifyUntouched() {
+                var _a, _b;
+                var value = this.getMirrorValue();
+                if (this.j.o.editHTMLDocumentMode || !value || value !== this.__filledValue) {
+                    return;
+                }
+                var html = this.j.e.fire('beautifyHTML', value);
+                if ((0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_4__.isString)(html) && html !== value) {
+                    var focused = (_a = this.sourceEditor) === null || _a === void 0 ? void 0 : _a.isFocused;
+                    this.setMirrorValue(html);
+                    this.__filledValue = this.getMirrorValue();
+                    focused && ((_b = this.sourceEditor) === null || _b === void 0 ? void 0 : _b.focus());
+                }
+            }
+        },
         {
             /** @override */ key: "beforeDestruct",
             value: function beforeDestruct() {
@@ -73944,10 +74052,21 @@ _core_global_js__WEBPACK_IMPORTED_MODULE_4__.pluginSystem.add('toolbarNavigation
 
 
 
+function insertVideos(data) {
+    var _this = this;
+    var _a;
+    (_a = data.files) === null || _a === void 0 ? void 0 : _a.forEach(function(file) {
+        _this.s.insertNode(_this.createInside.element('video', {
+            controls: '',
+            src: data.baseurl + file
+        }));
+    });
+}
 _config_js__WEBPACK_IMPORTED_MODULE_4__.Config.prototype.video = {
     parseUrlToVideoEmbed: _core_helpers_index_js__WEBPACK_IMPORTED_MODULE_0__.convertMediaUrlToVideoEmbed,
     defaultWidth: 400,
-    defaultHeight: 345
+    defaultHeight: 345,
+    defaultHandlerSuccess: insertVideos
 };
 _core_ui_icon_js__WEBPACK_IMPORTED_MODULE_3__.Icon.set('video', _video_svg_js__WEBPACK_IMPORTED_MODULE_6__["default"]);
 _config_js__WEBPACK_IMPORTED_MODULE_4__.Config.prototype.controls.video = {
@@ -73988,6 +74107,18 @@ _config_js__WEBPACK_IMPORTED_MODULE_4__.Config.prototype.controls.video = {
             close();
         };
         jodit.s.save();
+        var uploader = jodit.o.uploader;
+        // Base64 alone would put whole video files into the content
+        if (uploader.showTabInFileSelector !== false && (uploader.url || uploader.customUploadFunction)) {
+            tabs.push((0,_modules_widget_index_js__WEBPACK_IMPORTED_MODULE_5__.UploadTab)(jodit, function(data) {
+                var _a, _b;
+                jodit.s.restore();
+                ((_b = (_a = jodit.o.video) === null || _a === void 0 ? void 0 : _a.defaultHandlerSuccess) !== null && _b !== void 0 ? _b : insertVideos).call(jodit, data);
+            }, {
+                label: 'Drop file',
+                accept: 'video/*'
+            }));
+        }
         tabs.push({
             icon: 'link',
             name: 'Link',

package/es5/jodit.min.css

@@ -1,14 +1,14 @@
 /*!
  * jodit-pro - PRO Version of Jodit Editor
  * Author: Chupurnov Valerii <chupurnov@gmail.com>
- * Version: v4.16.2
+ * Version: v4.16.4
  * Url: https://xdsoft.net/jodit/pro/
  * License(s): SEE LICENSE IN LICENSE.md
  */
 	/*!
  * jodit-pro - PRO Version of Jodit Editor
  * Author: Chupurnov Valerii <chupurnov@gmail.com>
- * Version: v4.16.2
+ * Version: v4.16.4
  * Url: https://xdsoft.net/jodit/pro/
  * License(s): SEE LICENSE IN LICENSE.md
  */