jodit 4.15.4 → 4.15.6

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.15.4
+ * Version: v4.15.6
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -2107,7 +2107,7 @@ __webpack_require__.r(__webpack_exports__);
  * @packageDocumentation
  * @module constants
  */ 
-var APP_VERSION = "4.15.4";
+var APP_VERSION = "4.15.6";
 // prettier-ignore
 var ES = "es5";
 var IS_ES_MODERN = false;
@@ -34197,6 +34197,7 @@ jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_10__.Icon.set('class-span', (_class_
 	 * `<p><br></p>` left after deleting all content) to an empty string —
 	 * opt-in via `cleanHTML.collapseEmptyValueToEmptyString`. See #1149
 	 */ function onAfterGetValueFromEditor(data) {
+                this.__singleQuotesInFontFamily(data);
                 if (!this.j.o.cleanHTML.collapseEmptyValueToEmptyString) {
                     return;
                 }
@@ -34205,6 +34206,32 @@ jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_10__.Icon.set('class-span', (_class_
                 }
             }
         },
+        {
+            key: "__singleQuotesInFontFamily",
+            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.
+	 */ function __singleQuotesInFontFamily(data) {
+                if (!this.j.o.cleanHTML.singleQuotesInFontFamily || !data.value.includes('&quot;')) {
+                    return;
+                }
+                data.value = data.value.replace(/\sstyle="([^"]*)"/gi, function(attribute, css) {
+                    if (!css.includes('&quot;') || !/font-family/i.test(css)) {
+                        return attribute;
+                    }
+                    var 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, function(declaration) {
+                        return declaration.includes("'") ? declaration : declaration.replace(/&quot;/g, "'");
+                    });
+                    return attribute.replace(css, normalized);
+                });
+            }
+        },
         {
             key: "onSafeHTML",
             value: function onSafeHTML(sandBox) {
@@ -34275,6 +34302,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_1__.Config.prototype.cleanHTML = {
     removeEmptyElements: true,
     fillEmptyParagraph: true,
     collapseEmptyValueToEmptyString: false,
+    singleQuotesInFontFamily: true,
     replaceNBSP: true,
     replaceOldTags: {
         i: 'em',
@@ -43633,6 +43661,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_2__.Config.prototype.controls.link = {
                     jodit.history.snapshot.restore(snapshot);
                     var textWasChanged = getSelectionText() !== content_input.value.trim();
                     var ci = jodit.createInside;
+                    var caretAfter = null;
                     if (!_$link || !jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.isOrContains(jodit.editor, _$link)) {
                         if (!jodit.s.isCollapsed()) {
                             var node = jodit.s.current();
@@ -43649,6 +43678,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_2__.Config.prototype.controls.link = {
                             links = [
                                 a
                             ];
+                            caretAfter = a;
                         }
                         links.forEach(function(link) {
                             return jodit.s.select(link);
@@ -43683,6 +43713,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;

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