jodit 4.2.34 → 4.2.35

package/es5/plugins/debug/debug.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.2.34
+ * Version: v4.2.35
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */

package/es5/plugins/debug/debug.min.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.2.34
+ * Version: v4.2.35
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */

package/es5/plugins/speech-recognize/speech-recognize.css

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

package/es5/plugins/speech-recognize/speech-recognize.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.2.34
+ * Version: v4.2.35
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */

package/es5/plugins/speech-recognize/speech-recognize.min.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.2.34
+ * Version: v4.2.35
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */

package/esm/core/constants.js

@@ -3,7 +3,7 @@
  * Released under MIT see LICENSE.txt in the project root for license information.
  * Copyright (c) 2013-2024 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
  */
-export const APP_VERSION = "4.2.34";
+export const APP_VERSION = "4.2.35";
 // prettier-ignore
 export const ES = "es2020";
 export const IS_ES_MODERN = true;

package/esm/modules/history/snapshot.d.ts

@@ -63,5 +63,5 @@ export declare class Snapshot extends ViewComponent<IJodit> implements ISnapshot
     restoreOnlySelection(snapshot: SnapshotType): void;
     destruct(): void;
     private static isIgnoredNode;
-    private removeJoditSelection;
+    private __getCleanedEditorValue;
 }

package/esm/modules/history/snapshot.js

@@ -4,8 +4,8 @@
  * Copyright (c) 2013-2024 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
  */
 import { ViewComponent } from "../../core/component/index.js";
-import { IS_PROD, TEMP_ATTR } from "../../core/constants.js";
-import { Dom } from "../../core/dom/index.js";
+import { IS_PROD } from "../../core/constants.js";
+import { Dom } from "../../core/dom/dom.js";
 /**
  * Module for creating snapshot of editor which includes html content and the current selection
  */
@@ -119,10 +119,12 @@ export class Snapshot extends ViewComponent {
                 endOffset: 0
             }
         };
-        snapshot.html = this.removeJoditSelection(this.j.editor);
+        snapshot.html = this.__getCleanedEditorValue(this.j.editor);
         const sel = this.j.s.sel;
         if (sel && sel.rangeCount) {
-            const range = sel.getRangeAt(0), startContainer = this.calcHierarchyLadder(range.startContainer), endContainer = this.calcHierarchyLadder(range.endContainer);
+            const range = sel.getRangeAt(0);
+            const startContainer = this.calcHierarchyLadder(range.startContainer);
+            const endContainer = this.calcHierarchyLadder(range.endContainer);
             let startOffset = Snapshot.strokeOffset(range.startContainer, range.startOffset), endOffset = Snapshot.strokeOffset(range.endContainer, range.endOffset);
             if (!startContainer.length &&
                 range.startContainer !== this.j.editor) {
@@ -149,8 +151,8 @@ export class Snapshot extends ViewComponent {
     restore(snapshot) {
         this.transaction(() => {
             const scroll = this.storeScrollState();
-            const value = this.j.getNativeEditorValue();
-            if (value !== snapshot.html) {
+            const html = this.__getCleanedEditorValue(this.j.editor);
+            if (html !== snapshot.html) {
                 this.j.value = snapshot.html;
             }
             this.restoreOnlySelection(snapshot);
@@ -196,9 +198,9 @@ export class Snapshot extends ViewComponent {
     static isIgnoredNode(node) {
         return (Dom.isText(node) && !node.nodeValue) || Dom.isTemporary(node);
     }
-    removeJoditSelection(node) {
+    __getCleanedEditorValue(node) {
         const clone = node.cloneNode(true);
-        clone.querySelectorAll(`[${TEMP_ATTR}]`).forEach(Dom.unwrap);
+        Dom.temporaryList(clone).forEach(Dom.unwrap);
         return clone.innerHTML;
     }
 }

package/esm/plugins/link/link.js

@@ -101,13 +101,19 @@ export class link extends Plugin {
     __generateForm(current, close) {
         const { jodit } = this;
         const i18n = jodit.i18n.bind(jodit), { openInNewTabCheckbox, noFollowCheckbox, formTemplate, formClassName, modeClassName } = jodit.o.link;
-        const html = formTemplate(jodit), form = isString(html)
+        const html = formTemplate(jodit);
+        const form = isString(html)
             ? jodit.c.fromHTML(html, {
                 target_checkbox_box: openInNewTabCheckbox,
                 nofollow_checkbox_box: noFollowCheckbox
             })
-            : html, htmlForm = Dom.isElement(form) ? form : form.container;
-        const elements = refs(htmlForm), { insert, unlink, content_input_box } = elements, { target_checkbox, nofollow_checkbox, url_input } = elements, currentElement = current, isImageContent = Dom.isImage(currentElement);
+            : html;
+        const htmlForm = Dom.isElement(form) ? form : form.container;
+        const elements = refs(htmlForm);
+        const { insert, unlink, content_input_box } = elements;
+        const { target_checkbox, nofollow_checkbox, url_input } = elements;
+        const currentElement = current;
+        const isImageContent = Dom.isImage(currentElement);
         let { content_input } = elements;
         const { className_input } = elements, { className_select } = elements;
         if (!content_input) {
@@ -178,7 +184,7 @@ export class link extends Plugin {
             jodit.history.snapshot.restore(snapshot);
             const textWasChanged = getSelectionText() !== content_input.value.trim();
             const ci = jodit.createInside;
-            if (!link) {
+            if (!link || !Dom.isOrContains(jodit.editor, link)) {
                 if (!jodit.s.isCollapsed()) {
                     const node = jodit.s.current();
                     if (Dom.isTag(node, 'img')) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "jodit",
-	"version": "4.2.34",
+	"version": "4.2.35",
 	"description": "Jodit is an awesome and useful wysiwyg editor with filebrowser",
 	"main": "esm/index.js",
 	"types": "types/index.d.ts",

package/types/modules/history/snapshot.d.ts

@@ -63,5 +63,5 @@ export declare class Snapshot extends ViewComponent<IJodit> implements ISnapshot
     restoreOnlySelection(snapshot: SnapshotType): void;
     destruct(): void;
     private static isIgnoredNode;
-    private removeJoditSelection;
+    private __getCleanedEditorValue;
 }