jodit-pro 4.18.0 → 4.18.2

package/es5/jodit.js

@@ -1,7 +1,7 @@
 /*!
  * jodit-pro - PRO Version of Jodit Editor
  * Author: Chupurnov Valerii <chupurnov@gmail.com>
- * Version: v4.18.0
+ * Version: v4.18.2
  * Url: https://xdsoft.net/jodit/pro/
  * License(s): SEE LICENSE IN LICENSE.md
  */
@@ -2333,7 +2333,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.18.0";
+var APP_VERSION = "4.18.2";
 // prettier-ignore
 var ES = "es5";
 var IS_ES_MODERN = false;
@@ -48151,10 +48151,12 @@ function _wrap_native_super(Class) {
 var cleanHtml = /*#__PURE__*/ function(Plugin) {
     "use strict";
     _inherits(cleanHtml, Plugin);
-    function cleanHtml() {
+    function cleanHtml(jodit) {
         _class_call_check(this, cleanHtml);
         var _this;
-        _this = _call_super(this, cleanHtml, arguments);
+        _this = _call_super(this, cleanHtml, [
+            jodit
+        ]);
         /** @override */ _this.buttons = [
             {
                 name: 'eraser',
@@ -48165,12 +48167,22 @@ var cleanHtml = /*#__PURE__*/ function(Plugin) {
         _this.walker = new _core_dom_lazy_walker_js__WEBPACK_IMPORTED_MODULE_2__.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;
     }
     _create_class(cleanHtml, [
         {
             /** @override */ key: "afterInit",
-            value: function afterInit(jodit) {}
+            value: 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",
@@ -48346,6 +48358,7 @@ var cleanHtml = /*#__PURE__*/ function(Plugin) {
         {
             /** @override */ key: "beforeDestruct",
             value: function beforeDestruct() {
+                this.j.e.off('safeHTML', this.onSafeHTML).off('beforeSetNativeEditorValue', this.onBeforeSetNativeEditorValue).off('afterSetNativeEditorValue', this.onAfterSetNativeEditorValue);
                 this.walker.destruct();
             }
         }
@@ -48368,16 +48381,16 @@ __decorate([
     (0,_core_decorators_index_js__WEBPACK_IMPORTED_MODULE_0__.watch)(':beforeCommand')
 ], cleanHtml.prototype, "beforeCommand", null);
 __decorate([
-    (0,_core_decorators_index_js__WEBPACK_IMPORTED_MODULE_0__.watch)(':afterSetNativeEditorValue')
+    _core_decorators_index_js__WEBPACK_IMPORTED_MODULE_0__.autobind
 ], cleanHtml.prototype, "onAfterSetNativeEditorValue", null);
 __decorate([
-    (0,_core_decorators_index_js__WEBPACK_IMPORTED_MODULE_0__.watch)(':beforeSetNativeEditorValue')
+    _core_decorators_index_js__WEBPACK_IMPORTED_MODULE_0__.autobind
 ], cleanHtml.prototype, "onBeforeSetNativeEditorValue", null);
 __decorate([
     (0,_core_decorators_index_js__WEBPACK_IMPORTED_MODULE_0__.watch)(':afterGetValueFromEditor')
 ], cleanHtml.prototype, "onAfterGetValueFromEditor", null);
 __decorate([
-    (0,_core_decorators_index_js__WEBPACK_IMPORTED_MODULE_0__.watch)(':safeHTML')
+    _core_decorators_index_js__WEBPACK_IMPORTED_MODULE_0__.autobind
 ], cleanHtml.prototype, "onSafeHTML", null);
 _core_global_js__WEBPACK_IMPORTED_MODULE_3__.pluginSystem.add('cleanHtml', cleanHtml);
 
@@ -51497,7 +51510,12 @@ var brBoxes = new Set([
         if (_core_dom_dom_js__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 (!_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_0__.Dom.isOrContains(node, jodit.s.range.startContainer)) {
+            jodit.s.setCursorBefore(br);
+        }
         _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_0__.Dom.safeRemove(br);
     }
 }
@@ -51531,13 +51549,22 @@ var brBoxes = new Set([
         var current = (_b = (_a = jodit.s.current()) === null || _a === void 0 ? void 0 : _a.parentElement) !== null && _b !== void 0 ? _b : null;
         while(current && current !== jodit.editor){
             if (_core_dom_dom_js__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 && _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_0__.Dom.isTag(current, jodit.o.enter) && _core_dom_dom_js__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 (_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_0__.Dom.isLeaf(current) && _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_0__.Dom.isList(node) && _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_0__.Dom.isFragment(node.parentNode) && !_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_0__.Dom.findNotEmptySibling(node, false)) {
+            _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_0__.Dom.unwrap(node);
+            parent = current;
+        }
         if (parent) {
             jodit.s.setCursorAfter(parent);
             if (_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_0__.Dom.isEmpty(parent)) {
@@ -51588,10 +51615,12 @@ _config_js__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,
@@ -51599,6 +51628,7 @@ _config_js__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-pro - PRO Version of Jodit Editor
  * Author: Chupurnov Valerii <chupurnov@gmail.com>
- * Version: v4.18.0
+ * Version: v4.18.2
  * 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.18.0
+ * Version: v4.18.2
  * Url: https://xdsoft.net/jodit/pro/
  * License(s): SEE LICENSE IN LICENSE.md
  */