jodit 4.15.4 → 4.15.6

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.4
+ * Version: v4.15.6
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -1785,7 +1785,7 @@ __webpack_require__.r(__webpack_exports__);
  * ```
  * @packageDocumentation
  * @module constants
- */ const APP_VERSION = "4.15.4";
+ */ const APP_VERSION = "4.15.6";
 // prettier-ignore
 const ES = "es2015";
 const IS_ES_MODERN = true;
@@ -28598,6 +28598,7 @@ jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_5__.Icon.set('class-span', (_class_s
 	 * `<p><br></p>` left after deleting all content) to an empty string —
 	 * opt-in via `cleanHTML.collapseEmptyValueToEmptyString`. See #1149
 	 */ onAfterGetValueFromEditor(data) {
+        this.__singleQuotesInFontFamily(data);
         if (!this.j.o.cleanHTML.collapseEmptyValueToEmptyString) {
             return;
         }
@@ -28605,6 +28606,27 @@ jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_5__.Icon.set('class-span', (_class_s
             data.value = '';
         }
     }
+    /**
+	 * Rewrite double-quoted font names inside `style` attributes with single
+	 * quotes. The DOM always serialises them as `&quot;…&quot;`, and back ends
+	 * that HTML-decode the value before storing it then produce
+	 * `style="font-family: "Open Sans", …"` — broken markup. Single quotes
+	 * survive that round trip. Names that already contain an apostrophe are
+	 * left alone.
+	 */ __singleQuotesInFontFamily(data) {
+        if (!this.j.o.cleanHTML.singleQuotesInFontFamily || !data.value.includes('&quot;')) {
+            return;
+        }
+        data.value = data.value.replace(/\sstyle="([^"]*)"/gi, (attribute, css)=>{
+            if (!css.includes('&quot;') || !/font-family/i.test(css)) {
+                return attribute;
+            }
+            const normalized = css.replace(// `&quot;` itself ends with `;`, so the entity has to be
+            // consumed as a unit or the declaration stops inside it.
+            /font-family\s*:(?:&quot;|[^;])*/gi, (declaration)=>declaration.includes("'") ? declaration : declaration.replace(/&quot;/g, "'"));
+            return attribute.replace(css, normalized);
+        });
+    }
     onSafeHTML(sandBox) {
         const sanitizer = this.j.o.cleanHTML.sanitizer;
         if (sanitizer) {
@@ -28677,6 +28699,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_1__.Config.prototype.cleanHTML = {
     removeEmptyElements: true,
     fillEmptyParagraph: true,
     collapseEmptyValueToEmptyString: false,
+    singleQuotesInFontFamily: true,
     replaceNBSP: true,
     replaceOldTags: {
         i: 'em',
@@ -36990,6 +37013,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_2__.Config.prototype.controls.link = {
             jodit.history.snapshot.restore(snapshot);
             const textWasChanged = getSelectionText() !== content_input.value.trim();
             const ci = jodit.createInside;
+            let caretAfter = null;
             if (!link || !jodit_core_dom__WEBPACK_IMPORTED_MODULE_3__.Dom.isOrContains(jodit.editor, link)) {
                 if (!jodit.s.isCollapsed()) {
                     const node = jodit.s.current();
@@ -37006,6 +37030,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_2__.Config.prototype.controls.link = {
                     links = [
                         a
                     ];
+                    caretAfter = a;
                 }
                 links.forEach((link)=>jodit.s.select(link));
             } else {
@@ -37038,6 +37063,13 @@ jodit_config__WEBPACK_IMPORTED_MODULE_2__.Config.prototype.controls.link = {
                 }
                 jodit.e.fire('applyLink', jodit, a, form);
             });
+            // A brand-new link inserted at a collapsed caret used to stay
+            // *selected*. Safari does not paint that selection, so the next
+            // Enter silently replaced the link instead of starting a new line.
+            // Put the caret right after the link instead.
+            if (caretAfter) {
+                jodit.s.setCursorAfter(caretAfter);
+            }
             jodit.synchronizeValues();
             close();
             return false;