jodit 4.15.6 → 4.15.7

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.6
+ * Version: v4.15.7
  * 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.6";
+var APP_VERSION = "4.15.7";
 // prettier-ignore
 var ES = "es5";
 var IS_ES_MODERN = false;
@@ -34064,16 +34064,17 @@ jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_10__.Icon.set('class-span', (_class_
 /* harmony import */ var _swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(25045);
 /* harmony import */ var _swc_helpers_inherits__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(34918);
 /* harmony import */ var _swc_helpers_sliced_to_array__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(50684);
-/* harmony import */ var _swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(31635);
-/* harmony import */ var _swc_helpers_wrap_native_super__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(38574);
-/* harmony import */ var jodit_core_decorators__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(84839);
-/* harmony import */ var jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(23211);
-/* harmony import */ var jodit_core_dom_lazy_walker__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(1080);
-/* harmony import */ var jodit_core_global__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(28077);
-/* harmony import */ var jodit_core_helpers_html_safe_html__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(48155);
-/* harmony import */ var jodit_core_plugin_plugin__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(18855);
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(11173);
-/* harmony import */ var _helpers__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(54053);
+/* harmony import */ var _swc_helpers_to_consumable_array__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(42395);
+/* harmony import */ var _swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(31635);
+/* harmony import */ var _swc_helpers_wrap_native_super__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(38574);
+/* harmony import */ var jodit_core_decorators__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(84839);
+/* harmony import */ var jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(23211);
+/* harmony import */ var jodit_core_dom_lazy_walker__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(1080);
+/* harmony import */ var jodit_core_global__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(28077);
+/* harmony import */ var jodit_core_helpers_html_safe_html__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(48155);
+/* harmony import */ var jodit_core_plugin_plugin__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(18855);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(11173);
+/* harmony import */ var _helpers__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(54053);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -34098,9 +34099,11 @@ jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_10__.Icon.set('class-span', (_class_
 
 
 
+
 /**
  * Clean HTML after removeFormat and insertHorizontalRule command
- */ var cleanHtml = /*#__PURE__*/ function(Plugin) {
+ */ var TRAILING_BR_BLOCKS = 'p, div, li, td, th, h1, h2, h3, h4, h5, h6, blockquote';
+var cleanHtml = /*#__PURE__*/ function(Plugin) {
     "use strict";
     (0,_swc_helpers_inherits__WEBPACK_IMPORTED_MODULE_4__._)(cleanHtml, Plugin);
     function cleanHtml() {
@@ -34111,7 +34114,7 @@ jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_10__.Icon.set('class-span', (_class_
                 name: 'eraser',
                 group: 'font-style'
             }
-        ]), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "currentSelectionNode", null), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "walker", new jodit_core_dom_lazy_walker__WEBPACK_IMPORTED_MODULE_10__.LazyWalker(_this.j.async, {
+        ]), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "currentSelectionNode", null), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "walker", new jodit_core_dom_lazy_walker__WEBPACK_IMPORTED_MODULE_11__.LazyWalker(_this.j.async, {
             timeout: _this.j.o.cleanHTML.timeout
         }));
         return _this;
@@ -34145,10 +34148,10 @@ jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_10__.Icon.set('class-span', (_class_
             value: function startWalker() {
                 var _this = this;
                 var jodit = this.jodit;
-                var allow = (0,_helpers__WEBPACK_IMPORTED_MODULE_15__.getHash)(this.j.o.cleanHTML.allowTags);
-                var deny = (0,_helpers__WEBPACK_IMPORTED_MODULE_15__.getHash)(this.j.o.cleanHTML.denyTags);
+                var allow = (0,_helpers__WEBPACK_IMPORTED_MODULE_16__.getHash)(this.j.o.cleanHTML.allowTags);
+                var deny = (0,_helpers__WEBPACK_IMPORTED_MODULE_16__.getHash)(this.j.o.cleanHTML.denyTags);
                 this.walker.on('visit', function(node) {
-                    return (0,_helpers__WEBPACK_IMPORTED_MODULE_15__.visitNodeWalker)(jodit, node, allow, deny, _this.currentSelectionNode);
+                    return (0,_helpers__WEBPACK_IMPORTED_MODULE_16__.visitNodeWalker)(jodit, node, allow, deny, _this.currentSelectionNode);
                 }).on('end', function(affected) {
                     _this.j.e.fire(affected ? 'internalChange finishedCleanHTMLWorker' : 'finishedCleanHTMLWorker');
                 });
@@ -34159,9 +34162,9 @@ jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_10__.Icon.set('class-span', (_class_
             value: function beforeCommand(command) {
                 if (command.toLowerCase() === 'removeformat') {
                     if (this.j.s.isCollapsed()) {
-                        (0,_helpers__WEBPACK_IMPORTED_MODULE_15__.removeFormatForCollapsedSelection)(this.j);
+                        (0,_helpers__WEBPACK_IMPORTED_MODULE_16__.removeFormatForCollapsedSelection)(this.j);
                     } else {
-                        (0,_helpers__WEBPACK_IMPORTED_MODULE_15__.removeFormatForSelection)(this.j);
+                        (0,_helpers__WEBPACK_IMPORTED_MODULE_16__.removeFormatForSelection)(this.j);
                     }
                     return false;
                 }
@@ -34182,11 +34185,11 @@ jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_10__.Icon.set('class-span', (_class_
                 sandBox.innerHTML = data.value;
                 this.j.e.fire('safeHTML', sandBox);
                 data.value = sandBox.innerHTML;
-                (0,jodit_core_helpers_html_safe_html__WEBPACK_IMPORTED_MODULE_12__.safeHTML)(sandBox, {
+                (0,jodit_core_helpers_html_safe_html__WEBPACK_IMPORTED_MODULE_13__.safeHTML)(sandBox, {
                     safeJavaScriptLink: true,
                     removeOnError: true
                 });
-                jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_9__.Dom.safeRemove(iframe);
+                jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_10__.Dom.safeRemove(iframe);
                 return false;
             }
         },
@@ -34198,6 +34201,7 @@ jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_10__.Icon.set('class-span', (_class_
 	 * opt-in via `cleanHTML.collapseEmptyValueToEmptyString`. See #1149
 	 */ function onAfterGetValueFromEditor(data) {
                 this.__singleQuotesInFontFamily(data);
+                this.__removeTrailingBr(data);
                 if (!this.j.o.cleanHTML.collapseEmptyValueToEmptyString) {
                     return;
                 }
@@ -34207,7 +34211,7 @@ jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_10__.Icon.set('class-span', (_class_
             }
         },
         {
-            key: "__singleQuotesInFontFamily",
+            key: "__removeTrailingBr",
             value: /**
 	 * Rewrite double-quoted font names inside `style` attributes with single
 	 * quotes. The DOM always serialises them as `&quot;…&quot;`, and back ends
@@ -34215,7 +34219,41 @@ jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_10__.Icon.set('class-span', (_class_
 	 * `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) {
+	 */ /**
+	 * Drop a `<br>` that is the last node of a block (or of the value) and
+	 * follows other content — the caret placeholder browsers leave behind
+	 * after typing into an empty block. An empty block (`<p><br></p>`) and a
+	 * deliberate empty line (`text<br><br>`) are kept.
+	 */ function __removeTrailingBr(data) {
+                if (!this.j.o.cleanHTML.removeTrailingBr || !/<br/i.test(data.value)) {
+                    return;
+                }
+                var box = this.j.c.div();
+                box.innerHTML = data.value;
+                var blocks = [
+                    box
+                ].concat((0,_swc_helpers_to_consumable_array__WEBPACK_IMPORTED_MODULE_6__._)(box.querySelectorAll(TRAILING_BR_BLOCKS)));
+                blocks.forEach(function(block) {
+                    var _prev_nodeValue;
+                    var last = block.lastChild;
+                    if (!jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_10__.Dom.isTag(last, 'br')) {
+                        return;
+                    }
+                    var prev = last.previousSibling;
+                    if (!prev || jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_10__.Dom.isTag(prev, 'br')) {
+                        return;
+                    }
+                    if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_10__.Dom.isText(prev) && !((_prev_nodeValue = prev.nodeValue) === null || _prev_nodeValue === void 0 ? void 0 : _prev_nodeValue.trim()) && !prev.previousSibling) {
+                        return;
+                    }
+                    jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_10__.Dom.safeRemove(last);
+                });
+                data.value = box.innerHTML;
+            }
+        },
+        {
+            key: "__singleQuotesInFontFamily",
+            value: function __singleQuotesInFontFamily(data) {
                 if (!this.j.o.cleanHTML.singleQuotesInFontFamily || !data.value.includes('&quot;')) {
                     return;
                 }
@@ -34239,7 +34277,7 @@ jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_10__.Icon.set('class-span', (_class_
                 if (sanitizer) {
                     sandBox.innerHTML = sanitizer(sandBox.innerHTML);
                 }
-                ;(0,jodit_core_helpers_html_safe_html__WEBPACK_IMPORTED_MODULE_12__.safeHTML)(sandBox, this.j.o.cleanHTML);
+                ;(0,jodit_core_helpers_html_safe_html__WEBPACK_IMPORTED_MODULE_13__.safeHTML)(sandBox, this.j.o.cleanHTML);
             }
         },
         {
@@ -34250,9 +34288,9 @@ jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_10__.Icon.set('class-span', (_class_
         }
     ]);
     return cleanHtml;
-}((0,_swc_helpers_wrap_native_super__WEBPACK_IMPORTED_MODULE_7__._)(jodit_core_plugin_plugin__WEBPACK_IMPORTED_MODULE_13__.Plugin));
-(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_6__.__decorate)([
-    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_8__.watch)([
+}((0,_swc_helpers_wrap_native_super__WEBPACK_IMPORTED_MODULE_8__._)(jodit_core_plugin_plugin__WEBPACK_IMPORTED_MODULE_14__.Plugin));
+(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_7__.__decorate)([
+    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_9__.watch)([
         ':change',
         ':afterSetMode',
         ':afterInit',
@@ -34260,22 +34298,22 @@ jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_10__.Icon.set('class-span', (_class_
         ':keydown'
     ])
 ], cleanHtml.prototype, "onChangeCleanHTML", null);
-(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_6__.__decorate)([
-    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_8__.hook)('ready')
+(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_7__.__decorate)([
+    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_9__.hook)('ready')
 ], cleanHtml.prototype, "startWalker", null);
-(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_6__.__decorate)([
-    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_8__.watch)(':beforeCommand')
+(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_7__.__decorate)([
+    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_9__.watch)(':beforeCommand')
 ], cleanHtml.prototype, "beforeCommand", null);
-(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_6__.__decorate)([
-    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_8__.watch)(':beforeSetNativeEditorValue')
+(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_7__.__decorate)([
+    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_9__.watch)(':beforeSetNativeEditorValue')
 ], cleanHtml.prototype, "onBeforeSetNativeEditorValue", null);
-(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_6__.__decorate)([
-    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_8__.watch)(':afterGetValueFromEditor')
+(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_7__.__decorate)([
+    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_9__.watch)(':afterGetValueFromEditor')
 ], cleanHtml.prototype, "onAfterGetValueFromEditor", null);
-(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_6__.__decorate)([
-    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_8__.watch)(':safeHTML')
+(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_7__.__decorate)([
+    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_9__.watch)(':safeHTML')
 ], cleanHtml.prototype, "onSafeHTML", null);
-jodit_core_global__WEBPACK_IMPORTED_MODULE_11__.pluginSystem.add('cleanHtml', cleanHtml);
+jodit_core_global__WEBPACK_IMPORTED_MODULE_12__.pluginSystem.add('cleanHtml', cleanHtml);
 
 
 /***/ }),
@@ -34303,6 +34341,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_1__.Config.prototype.cleanHTML = {
     fillEmptyParagraph: true,
     collapseEmptyValueToEmptyString: false,
     singleQuotesInFontFamily: true,
+    removeTrailingBr: false,
     replaceNBSP: true,
     replaceOldTags: {
         i: 'em',
@@ -36573,6 +36612,11 @@ var DragState = /*#__PURE__*/ (/* unused pure expression or super */ null && (fu
                     this.state = 2;
                 }
                 this.j.e.fire('hidePopup hideResizer');
+                // The ghost lives in the top document (position: fixed), but the
+                // mousemove comes from the editor document. In iframe mode those are
+                // different viewports, so the iframe's own offset has to be added or
+                // the ghost trails the pointer by exactly that distance (#1455).
+                var offset = this.__ghostOffset();
                 if (!this.draggable.parentNode) {
                     var _ref, _ref1;
                     var target = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_10__.dataBind)(this.draggable, 'target');
@@ -36583,20 +36627,39 @@ var DragState = /*#__PURE__*/ (/* unused pure expression or super */ null && (fu
                         position: 'fixed',
                         opacity: 0.7,
                         display: 'inline-block',
-                        left: event.clientX,
-                        top: event.clientY,
+                        left: event.clientX + offset.left,
+                        top: event.clientY + offset.top,
                         width: (_ref = target === null || target === void 0 ? void 0 : target.offsetWidth) !== null && _ref !== void 0 ? _ref : 100,
                         height: (_ref1 = target === null || target === void 0 ? void 0 : target.offsetHeight) !== null && _ref1 !== void 0 ? _ref1 : 100
                     });
                     jodit_core_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.append((0,jodit_core_global__WEBPACK_IMPORTED_MODULE_9__.getContainer)(this.j, dragAndDropElement), this.draggable);
                 }
                 ;(0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_10__.css)(this.draggable, {
-                    left: event.clientX,
-                    top: event.clientY
+                    left: event.clientX + offset.left,
+                    top: event.clientY + offset.top
                 });
+                // The caret goes into the editor document, so it keeps the raw
+                // (iframe-relative) coordinates.
                 this.j.s.insertCursorAtPoint(event.clientX, event.clientY);
             }
         },
+        {
+            key: "__ghostOffset",
+            value: function __ghostOffset() {
+                var iframe = this.j.iframe;
+                if (!iframe) {
+                    return {
+                        left: 0,
+                        top: 0
+                    };
+                }
+                var rect = iframe.getBoundingClientRect();
+                return {
+                    left: rect.left,
+                    top: rect.top
+                };
+            }
+        },
         {
             key: "onDragEnd",
             value: /**

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