jodit 4.15.14 → 4.15.16

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.14
+ * Version: v4.15.16
  * 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.14";
+ */ const APP_VERSION = "4.15.16";
 // 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 {
@@ -38570,10 +38582,13 @@ jodit_config__WEBPACK_IMPORTED_MODULE_2__.Config.prototype.controls.paste = {
             dialog.close();
             callback(value);
         }));
-    dialog.e.one(dialog, 'afterClose', ()=>{
+    dialog.e.on(dialog, 'beforeClose', ()=>{
+        jodit.e.fire('beforeClosePasteDialog', dialog);
+    }).one(dialog, 'afterClose', ()=>{
         if (!jodit.s.isFocused()) {
             jodit.s.focus();
         }
+        jodit.e.fire('afterClosePasteDialog', dialog);
     });
     const cancel = (0,jodit_core_ui_button_button_button__WEBPACK_IMPORTED_MODULE_3__.Button)(jodit, {
         text: 'Cancel',
@@ -38942,7 +38957,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();
         });