jodit 4.18.0 → 4.18.2

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.18.0
+ * Version: v4.18.2
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -2154,7 +2154,7 @@ __webpack_require__.r(__webpack_exports__);
  * @packageDocumentation
  * @module constants
  */ 
-var APP_VERSION = "4.18.0";
+var APP_VERSION = "4.18.2";
 // prettier-ignore
 var ES = "es5";
 var IS_ES_MODERN = false;
@@ -34887,10 +34887,12 @@ jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_10__.Icon.set('class-span', (_class_
 var cleanHtml = /*#__PURE__*/ function(Plugin) {
     "use strict";
     (0,_swc_helpers_inherits__WEBPACK_IMPORTED_MODULE_4__._)(cleanHtml, Plugin);
-    function cleanHtml() {
+    function cleanHtml(jodit) {
         (0,_swc_helpers_class_call_check__WEBPACK_IMPORTED_MODULE_1__._)(this, cleanHtml);
         var _this;
-        _this = (0,_swc_helpers_call_super__WEBPACK_IMPORTED_MODULE_0__._)(this, cleanHtml, arguments), /** @override */ (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "buttons", [
+        _this = (0,_swc_helpers_call_super__WEBPACK_IMPORTED_MODULE_0__._)(this, cleanHtml, [
+            jodit
+        ]), /** @override */ (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "buttons", [
             {
                 name: 'eraser',
                 group: 'font-style'
@@ -34898,12 +34900,22 @@ var cleanHtml = /*#__PURE__*/ function(Plugin) {
         ]), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "currentSelectionNode", null), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "walker", new jodit_core_dom_lazy_walker__WEBPACK_IMPORTED_MODULE_11__.LazyWalker(_this.j.async, {
             timeout: _this.j.o.cleanHTML.timeout
         }));
+        // `@watch` binds once the plugin is ready, which is after the initial
+        // value has already gone into the editor. The handlers that keep
+        // markup out of the live tree have to be there from the start, or
+        // event handlers in a textarea's content run before anything
+        // sanitises them.
+        jodit.e.on('safeHTML', _this.onSafeHTML).on('beforeSetNativeEditorValue', _this.onBeforeSetNativeEditorValue).on('afterSetNativeEditorValue', _this.onAfterSetNativeEditorValue);
         return _this;
     }
     ;(0,_swc_helpers_create_class__WEBPACK_IMPORTED_MODULE_2__._)(cleanHtml, [
         {
             key: "afterInit",
-            value: /** @override */ function afterInit(jodit) {}
+            value: /** @override */ function afterInit() {
+                // The walker's own `:afterInit` watcher is bound on that very event,
+                // so without this the first pass waited for the first key or click
+                this.onChangeCleanHTML();
+            }
         },
         {
             key: "isEditMode",
@@ -35079,6 +35091,7 @@ var cleanHtml = /*#__PURE__*/ function(Plugin) {
         {
             key: "beforeDestruct",
             value: /** @override */ function beforeDestruct() {
+                this.j.e.off('safeHTML', this.onSafeHTML).off('beforeSetNativeEditorValue', this.onBeforeSetNativeEditorValue).off('afterSetNativeEditorValue', this.onAfterSetNativeEditorValue);
                 this.walker.destruct();
             }
         }
@@ -35101,16 +35114,16 @@ var cleanHtml = /*#__PURE__*/ function(Plugin) {
     (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_9__.watch)(':beforeCommand')
 ], cleanHtml.prototype, "beforeCommand", null);
 (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_7__.__decorate)([
-    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_9__.watch)(':afterSetNativeEditorValue')
+    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_9__.autobind
 ], cleanHtml.prototype, "onAfterSetNativeEditorValue", null);
 (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_7__.__decorate)([
-    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_9__.watch)(':beforeSetNativeEditorValue')
+    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_9__.autobind
 ], cleanHtml.prototype, "onBeforeSetNativeEditorValue", null);
 (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_7__.__decorate)([
     (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_9__.watch)(':afterGetValueFromEditor')
 ], cleanHtml.prototype, "onAfterGetValueFromEditor", null);
 (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_7__.__decorate)([
-    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_9__.watch)(':safeHTML')
+    jodit_core_decorators__WEBPACK_IMPORTED_MODULE_9__.autobind
 ], cleanHtml.prototype, "onSafeHTML", null);
 jodit_core_global__WEBPACK_IMPORTED_MODULE_12__.pluginSystem.add('cleanHtml', cleanHtml);
 
@@ -37894,7 +37907,12 @@ var brBoxes = new Set([
         if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.findNotEmptySibling(br, false)) {
             return;
         }
-        jodit.s.setCursorBefore(br);
+        // After a block is inserted the caret is already at the end of its
+        // text; moving it before the `<br>` would put it on a line of its own
+        // below the block (#1315)
+        if (!jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isOrContains(node, jodit.s.range.startContainer)) {
+            jodit.s.setCursorBefore(br);
+        }
         jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.safeRemove(br);
     }
 }
@@ -37933,13 +37951,22 @@ var brBoxes = new Set([
         var current = (_ref = (_jodit_s_current = jodit.s.current()) === null || _jodit_s_current === void 0 ? void 0 : _jodit_s_current.parentElement) !== null && _ref !== void 0 ? _ref : null;
         while(current && current !== jodit.editor){
             if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isBlock(current)) {
-                if (jodit.o.dtd.blockLimits[current.nodeName.toLowerCase()]) {
+                // In DIV mode the caret's own empty block is a line, like
+                // `<p><br></p>`, not a container to insert into (#1315)
+                var isEmptyLine = !parent && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isTag(current, jodit.o.enter) && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isEmpty(current);
+                if (jodit.o.dtd.blockLimits[current.nodeName.toLowerCase()] && !isEmptyLine) {
                     break;
                 }
                 parent = current;
             }
             current = current.parentElement;
         }
+        // A list that is all of the inserted content adds its items to the
+        // list of the item it goes into, as the browsers' own paste does
+        if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isLeaf(current) && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isList(node) && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isFragment(node.parentNode) && !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.findNotEmptySibling(node, false)) {
+            jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.unwrap(node);
+            parent = current;
+        }
         if (parent) {
             jodit.s.setCursorAfter(parent);
             if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isEmpty(parent)) {
@@ -37994,10 +38021,12 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.dtd = {
         audio: 1,
         body: 1,
         caption: 1,
+        dd: 1,
         details: 1,
         dir: 1,
         div: 1,
         dl: 1,
+        dt: 1,
         fieldset: 1,
         figcaption: 1,
         figure: 1,
@@ -38005,6 +38034,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.dtd = {
         form: 1,
         header: 1,
         hgroup: 1,
+        li: 1,
         main: 1,
         menu: 1,
         nav: 1,

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.18.0
+ * Version: v4.18.2
  * 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.18.0
+ * Version: v4.18.2
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */