jodit 4.15.15 → 4.15.17

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.15.15
+ * Version: v4.15.17
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -1786,7 +1786,7 @@ __webpack_require__.r(__webpack_exports__);
  * ```
  * @packageDocumentation
  * @module constants
- */ const APP_VERSION = "4.15.15";
+ */ const APP_VERSION = "4.15.17";
 // prettier-ignore
 const ES = "es2015";
 const IS_ES_MODERN = true;
@@ -28737,7 +28737,10 @@ class cleanHtml extends jodit_core_plugin_plugin__WEBPACK_IMPORTED_MODULE_7__.Pl
         if (!this.j.o.cleanHTML.collapseEmptyValueToEmptyString) {
             return;
         }
-        if (/^<([a-z][a-z0-9]*)\b[^>]*>(?:<br\/?>)?<\/\1>$/i.test(data.value.trim())) {
+        // Only a text block can be an empty caret container; a lone video,
+        // iframe or icon has no children but is content in itself
+        const lone = /^<([a-z][a-z0-9]*)\b[^>]*>(?:<br\/?>)?<\/\1>$/i.exec(data.value.trim());
+        if (lone && /^(p|div|h[1-6]|blockquote|pre)$/i.test(lone[1])) {
             data.value = '';
         }
     }
@@ -30027,6 +30030,15 @@ jodit_core_global__WEBPACK_IMPORTED_MODULE_0__.pluginSystem.add('color', color);
 
 
 jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_2__.Icon.set('brush', (_brush_svg__WEBPACK_IMPORTED_MODULE_5___default()));
+/**
+ * Set a color style; an empty value removes it, and with it the `style`
+ * attribute once nothing else is left in it
+ */ function setColorStyle(elm, key, value) {
+    (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.css)(elm, key, value);
+    if (!(0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.attr)(elm, 'style')) {
+        (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.attr)(elm, 'style', null);
+    }
+}
 jodit_config__WEBPACK_IMPORTED_MODULE_3__.Config.prototype.controls.brushCell = {
     isVisible: (editor)=>{
         return !editor.o.disablePlugins.includes('color');
@@ -30042,7 +30054,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_3__.Config.prototype.controls.brushCell =
         }
         const makeColorPicker = (key)=>(0,jodit_modules_widget__WEBPACK_IMPORTED_MODULE_4__.ColorPickerWidget)(editor, (value)=>{
                 selected.forEach((cell)=>{
-                    ;(0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.css)(cell, key, value);
+                    setColorStyle(cell, key, value);
                 });
                 editor.lock();
                 editor.synchronizeValues();
@@ -30128,7 +30140,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_3__.Config.prototype.controls.brush = {
             if (!currentElement) {
                 editor.execCommand('background', false, value);
             } else {
-                (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.css)(currentElement, 'backgroundColor', value);
+                setColorStyle(currentElement, 'backgroundColor', value);
             }
             ;(0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.dataBind)(button, 'color', value);
             (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.dataBind)(button, 'color-mode', 'background');
@@ -30138,7 +30150,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_3__.Config.prototype.controls.brush = {
             if (!currentElement) {
                 editor.execCommand('forecolor', false, value);
             } else {
-                (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.css)(currentElement, 'color', value);
+                setColorStyle(currentElement, 'color', value);
             }
             ;(0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.dataBind)(button, 'color', value);
             (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.dataBind)(button, 'color-mode', 'color');
@@ -30167,10 +30179,10 @@ jodit_config__WEBPACK_IMPORTED_MODULE_3__.Config.prototype.controls.brush = {
         if (current && current !== jodit.editor && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isNode(current) && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isElement(current)) {
             switch(mode){
                 case 'color':
-                    (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.css)(current, 'color', color);
+                    setColorStyle(current, 'color', color);
                     break;
                 case 'background':
-                    (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.css)(current, 'backgroundColor', color);
+                    setColorStyle(current, 'backgroundColor', color);
                     break;
             }
         } else {
@@ -32192,14 +32204,28 @@ jodit_core_global__WEBPACK_IMPORTED_MODULE_1__.pluginSystem.add('file', file);
  */ jodit_config__WEBPACK_IMPORTED_MODULE_2__.Config.prototype.saveSelectionOnBlur = true;
 function focus(editor) {
     if (editor.o.saveSelectionOnBlur) {
+        // A click that brings focus back places the caret itself, and Chrome
+        // has already placed it when focus fires, so restoring would move it
+        // back to the old selection. The saved markers are dropped instead.
+        let focusByPointer = false;
         editor.e.on('blur', ()=>{
+            // A press that never brought the focus back must not decide
+            // what the next focus does
+            focusByPointer = false;
             if (editor.isEditorMode()) {
                 editor.s.save(true);
             }
+        }).on('mousedown touchstart', ()=>{
+            focusByPointer = !editor.editorIsActive;
         }).on('focus', ()=>{
             if (editor.isEditorMode()) {
-                editor.s.restore();
+                if (focusByPointer) {
+                    editor.s.removeMarkers();
+                } else {
+                    editor.s.restore();
+                }
             }
+            focusByPointer = false;
         });
     }
     const focus = ()=>{
@@ -33239,11 +33265,12 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.imageProcessor = {
 /* harmony import */ var _swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(31635);
 /* harmony import */ var jodit_core_constants__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(81937);
 /* harmony import */ var jodit_core_decorators__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(84839);
-/* harmony import */ var jodit_core_global__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(28077);
-/* harmony import */ var jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(65946);
-/* harmony import */ var jodit_core_plugin__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(91206);
-/* harmony import */ var jodit_modules_uploader_helpers_data_uri_to_blob__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(23112);
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(51034);
+/* harmony import */ var jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(23211);
+/* harmony import */ var jodit_core_global__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(28077);
+/* harmony import */ var jodit_core_helpers__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(65946);
+/* harmony import */ var jodit_core_plugin__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(91206);
+/* harmony import */ var jodit_modules_uploader_helpers_data_uri_to_blob__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(23112);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(51034);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -33261,11 +33288,12 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.imageProcessor = {
 
 
 
+
 const JODIT_IMAGE_PROCESSOR_BINDED = '__jodit_imageprocessor_binded';
 const JODIT_IMAGE_BLOB_ID = JODIT_IMAGE_PROCESSOR_BINDED + 'blob-id';
 /**
  * Change editor's size after load all images
- */ class imageProcessor extends jodit_core_plugin__WEBPACK_IMPORTED_MODULE_6__.Plugin {
+ */ class imageProcessor extends jodit_core_plugin__WEBPACK_IMPORTED_MODULE_7__.Plugin {
     afterInit(jodit) {}
     beforeDestruct(jodit) {
         const buffer = (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_3__.cached)(jodit, 'buffer');
@@ -33304,9 +33332,9 @@ const JODIT_IMAGE_BLOB_ID = JODIT_IMAGE_PROCESSOR_BINDED + 'blob-id';
             if (!editor.editor) {
                 return;
             }
-            ;(0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.$$)('img', editor.editor).forEach((elm)=>{
-                if (!(0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.dataBind)(elm, JODIT_IMAGE_PROCESSOR_BINDED)) {
-                    (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_5__.dataBind)(elm, JODIT_IMAGE_PROCESSOR_BINDED, true);
+            ;(0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_6__.$$)('img', editor.editor).forEach((elm)=>{
+                if (!(0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_6__.dataBind)(elm, JODIT_IMAGE_PROCESSOR_BINDED)) {
+                    (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_6__.dataBind)(elm, JODIT_IMAGE_PROCESSOR_BINDED, true);
                     if (!elm.complete) {
                         editor.e.on(elm, 'load', function ElementOnLoad() {
                             var _editor_e;
@@ -33318,6 +33346,7 @@ const JODIT_IMAGE_BLOB_ID = JODIT_IMAGE_PROCESSOR_BINDED + 'blob-id';
                         replaceDataURIToBlobUUID(editor, elm);
                     }
                     editor.e.on(elm, 'mousedown touchstart', ()=>{
+                        removeCaretText(elm);
                         editor.s.select(elm);
                     });
                 }
@@ -33339,6 +33368,24 @@ const JODIT_IMAGE_BLOB_ID = JODIT_IMAGE_PROCESSOR_BINDED + 'blob-id';
     ]),
     (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_3__.debounce)()
 ], imageProcessor.prototype, "afterChange", null);
+/**
+ * Remove the invisible-space text beside an image, which only held a caret.
+ * Selecting the image replaces the caret, and with the text still after a
+ * block image, Safari highlights the rest of the image's line. See #1512
+ */ function removeCaretText(elm) {
+    for (const side of [
+        'previousSibling',
+        'nextSibling'
+    ]){
+        var _node_nodeValue;
+        let node = elm[side];
+        while(jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.Dom.isText(node) && !((_node_nodeValue = node.nodeValue) === null || _node_nodeValue === void 0 ? void 0 : _node_nodeValue.replace((0,jodit_core_constants__WEBPACK_IMPORTED_MODULE_2__.INVISIBLE_SPACE_REG_EXP)(), ''))){
+            const next = node[side];
+            jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_4__.Dom.safeRemove(node);
+            node = next;
+        }
+    }
+}
 function replaceDataURIToBlobUUID(editor, elm) {
     if (!editor.o.imageProcessor.replaceDataURIToBlobIdInView) {
         return;
@@ -33349,7 +33396,7 @@ function replaceDataURIToBlobUUID(editor, elm) {
     const dataUri = elm.src;
     let blob;
     try {
-        blob = (0,jodit_modules_uploader_helpers_data_uri_to_blob__WEBPACK_IMPORTED_MODULE_7__.dataURItoBlob)(dataUri);
+        blob = (0,jodit_modules_uploader_helpers_data_uri_to_blob__WEBPACK_IMPORTED_MODULE_8__.dataURItoBlob)(dataUri);
     } catch (unused) {
         // A data URI the browser accepts but we cannot decode is not worth
         // breaking the editor over — keep the image as it is
@@ -33362,7 +33409,7 @@ function replaceDataURIToBlobUUID(editor, elm) {
     list[elm.src] = dataUri;
     editor.buffer.set(JODIT_IMAGE_BLOB_ID, list);
 }
-jodit_core_global__WEBPACK_IMPORTED_MODULE_4__.pluginSystem.add('imageProcessor', imageProcessor);
+jodit_core_global__WEBPACK_IMPORTED_MODULE_5__.pluginSystem.add('imageProcessor', imageProcessor);
 
 
 /***/ }),
@@ -34856,10 +34903,12 @@ UIImagePositionTab = (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_1__.__
         marginBottom,
         marginLeft
     ];
+    // Compared with the inline value, which is what `readMargins` showed, so a
+    // margin from a stylesheet is not overwritten when the field is unchanged
     const applyMargin = (key, value)=>{
-        const oldValue = (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_0__.css)(image, key);
+        const oldValue = (0,_utils_utils__WEBPACK_IMPORTED_MODULE_1__.normalSizeToString)((0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_0__.cssInline)(image, key) || 0);
         const v = (0,_utils_utils__WEBPACK_IMPORTED_MODULE_1__.normalSizeToString)(value);
-        if (oldValue.toString() !== v.toString()) {
+        if (oldValue !== v) {
             (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_0__.css)(image, key, v);
         }
     };
@@ -35687,6 +35736,14 @@ const align = {
             'Normal'
         ],
         tooltip: 'Vertical align',
+        // `vertical-align` only moves an image in the line, not a floated or block one
+        isDisabled: (editor, button)=>{
+            const image = button.target;
+            return Boolean(image && ([
+                'left',
+                'right'
+            ].includes((0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_3__.css)(image, 'float')) || (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_3__.css)(image, 'display') === 'block'));
+        },
         exec: (editor, image, { control })=>{
             if (!jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isTag(image, 'img')) {
                 return;
@@ -38945,7 +39002,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.useInputsPlaceholder
                 this.placeholderElm.innerHTML = (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_7__.attr)(editor.element, 'placeholder') || '';
             }
             editor.e.fire('placeholder', this.placeholderElm.innerHTML);
-            editor.e.off('.placeholder').on('changePlace.placeholder', this.addNativeListeners).on('change.placeholder focus.placeholder keyup.placeholder mouseup.placeholder keydown.placeholder ' + 'mousedown.placeholder afterSetMode.placeholder changePlace.placeholder', this.toggle).on(window, 'load', this.toggle);
+            editor.e.off('.placeholder').on('changePlace.placeholder', this.addNativeListeners).on('change.placeholder focus.placeholder keyup.placeholder mouseup.placeholder keydown.placeholder ' + 'mousedown.placeholder afterSetMode.placeholder changePlace.placeholder ' + 'internalChange.placeholder', this.toggle).on(window, 'load', this.toggle);
             this.addNativeListeners();
             this.toggle();
         });