jodit-pro 4.2.31 → 4.2.33

package/es5/jodit.js

@@ -1,7 +1,7 @@
 /*!
  * jodit-pro - PRO Version of Jodit Editor
  * Author: Chupurnov Valeriy <chupurnov@gmail.com>
- * Version: v4.2.31
+ * Version: v4.2.33
  * Url: https://xdsoft.net/jodit/pro/
  * License(s): SEE LICENSE IN LICENSE.md
  */
@@ -2558,7 +2558,7 @@ __webpack_require__.r(__webpack_exports__);
  * Copyright (c) 2013-2024 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
  */
 
-var APP_VERSION = "4.2.31";
+var APP_VERSION = "4.2.33";
 // prettier-ignore
 var ES = "es5";
 var IS_ES_MODERN = false;
@@ -13297,7 +13297,9 @@ function unwrapList(mode, list, li, jodit, cs) {
     (0,jodit_core_selection_style_api_extract__WEBPACK_IMPORTED_MODULE_2__/* .extractSelectedPart */ .y)(list, li, jodit);
     void 0;
     jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__/* .Dom */ .J.unwrap(li.parentElement);
-    return jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__/* .Dom */ .J.replace(li, jodit.o.enter, jodit.createInside);
+    return jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__/* .Dom */ .J.replace(li, jodit.o.enter.toLowerCase() !== 'br'
+        ? jodit.o.enter
+        : jodit.createInside.fragment(), jodit.createInside);
 }
 
 
@@ -23032,7 +23034,7 @@ var History = /** @class */ (function (_super) {
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(31635);
 /* harmony import */ var jodit_core_component__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(79834);
 /* harmony import */ var jodit_core_constants__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(67259);
-/* harmony import */ var jodit_core_dom__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(33465);
+/* harmony import */ var jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(23545);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -23078,7 +23080,7 @@ var Snapshot = /** @class */ (function (_super) {
         for (var j = 0; j < elms.length; j += 1) {
             if (previous &&
                 !this.isIgnoredNode(elms[j]) &&
-                !(jodit_core_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isText(previous) && jodit_core_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isText(elms[j]))) {
+                !(jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isText(previous) && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isText(elms[j]))) {
                 count += 1;
             }
             if (elms[j] === elm) {
@@ -23092,9 +23094,9 @@ var Snapshot = /** @class */ (function (_super) {
      * Calc normal offset in joined text nodes
      */
     Snapshot.strokeOffset = function (elm, offset) {
-        while (jodit_core_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isText(elm)) {
+        while (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isText(elm)) {
             elm = elm.previousSibling;
-            if (jodit_core_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isText(elm) && elm.nodeValue) {
+            if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isText(elm) && elm.nodeValue) {
                 offset += elm.nodeValue.length;
             }
         }
@@ -23105,7 +23107,7 @@ var Snapshot = /** @class */ (function (_super) {
      */
     Snapshot.prototype.calcHierarchyLadder = function (elm) {
         var counts = [];
-        if (!elm || !elm.parentNode || !jodit_core_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isOrContains(this.j.editor, elm)) {
+        if (!elm || !elm.parentNode || !jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isOrContains(this.j.editor, elm)) {
             return [];
         }
         while (elm && elm !== this.j.editor) {
@@ -23161,10 +23163,12 @@ var Snapshot = /** @class */ (function (_super) {
                 endOffset: 0
             }
         };
-        snapshot.html = this.removeJoditSelection(this.j.editor);
+        snapshot.html = this.__getCleanedEditorValue(this.j.editor);
         var sel = this.j.s.sel;
         if (sel && sel.rangeCount) {
-            var range = sel.getRangeAt(0), startContainer = this.calcHierarchyLadder(range.startContainer), endContainer = this.calcHierarchyLadder(range.endContainer);
+            var range = sel.getRangeAt(0);
+            var startContainer = this.calcHierarchyLadder(range.startContainer);
+            var endContainer = this.calcHierarchyLadder(range.endContainer);
             var startOffset = Snapshot.strokeOffset(range.startContainer, range.startOffset), endOffset = Snapshot.strokeOffset(range.endContainer, range.endOffset);
             if (!startContainer.length &&
                 range.startContainer !== this.j.editor) {
@@ -23192,8 +23196,8 @@ var Snapshot = /** @class */ (function (_super) {
         var _this = this;
         this.transaction(function () {
             var scroll = _this.storeScrollState();
-            var value = _this.j.getNativeEditorValue();
-            if (value !== snapshot.html) {
+            var html = _this.__getCleanedEditorValue(_this.j.editor);
+            if (html !== snapshot.html) {
                 _this.j.value = snapshot.html;
             }
             _this.restoreOnlySelection(snapshot);
@@ -23237,11 +23241,11 @@ var Snapshot = /** @class */ (function (_super) {
         _super.prototype.destruct.call(this);
     };
     Snapshot.isIgnoredNode = function (node) {
-        return (jodit_core_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isText(node) && !node.nodeValue) || jodit_core_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isTemporary(node);
+        return (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isText(node) && !node.nodeValue) || jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.isTemporary(node);
     };
-    Snapshot.prototype.removeJoditSelection = function (node) {
+    Snapshot.prototype.__getCleanedEditorValue = function (node) {
         var clone = node.cloneNode(true);
-        clone.querySelectorAll("[".concat(jodit_core_constants__WEBPACK_IMPORTED_MODULE_1__.TEMP_ATTR, "]")).forEach(jodit_core_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.unwrap);
+        jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.temporaryList(clone).forEach(jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_2__/* .Dom */ .J.unwrap);
         return clone.innerHTML;
     };
     return Snapshot;
@@ -37493,13 +37497,19 @@ var link = /** @class */ (function (_super) {
     link.prototype.__generateForm = function (current, close) {
         var jodit = this.jodit;
         var i18n = jodit.i18n.bind(jodit), _a = jodit.o.link, openInNewTabCheckbox = _a.openInNewTabCheckbox, noFollowCheckbox = _a.noFollowCheckbox, formTemplate = _a.formTemplate, formClassName = _a.formClassName, modeClassName = _a.modeClassName;
-        var html = formTemplate(jodit), form = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_3__.isString)(html)
+        var html = formTemplate(jodit);
+        var form = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_3__.isString)(html)
             ? jodit.c.fromHTML(html, {
                 target_checkbox_box: openInNewTabCheckbox,
                 nofollow_checkbox_box: noFollowCheckbox
             })
-            : html, htmlForm = jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isElement(form) ? form : form.container;
-        var elements = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_3__.refs)(htmlForm), insert = elements.insert, unlink = elements.unlink, content_input_box = elements.content_input_box, _b = elements, target_checkbox = _b.target_checkbox, nofollow_checkbox = _b.nofollow_checkbox, url_input = _b.url_input, currentElement = current, isImageContent = jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isImage(currentElement);
+            : html;
+        var htmlForm = jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isElement(form) ? form : form.container;
+        var elements = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_3__.refs)(htmlForm);
+        var insert = elements.insert, unlink = elements.unlink, content_input_box = elements.content_input_box;
+        var _b = elements, target_checkbox = _b.target_checkbox, nofollow_checkbox = _b.nofollow_checkbox, url_input = _b.url_input;
+        var currentElement = current;
+        var isImageContent = jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isImage(currentElement);
         var content_input = elements.content_input;
         var className_input = elements.className_input, className_select = elements.className_select;
         if (!content_input) {
@@ -37572,7 +37582,7 @@ var link = /** @class */ (function (_super) {
             jodit.history.snapshot.restore(snapshot);
             var textWasChanged = getSelectionText() !== content_input.value.trim();
             var ci = jodit.createInside;
-            if (!link) {
+            if (!link || !jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isOrContains(jodit.editor, link)) {
                 if (!jodit.s.isCollapsed()) {
                     var node = jodit.s.current();
                     if (jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isTag(node, 'img')) {

package/es5/jodit.min.css

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