jodit-pro 4.12.22 → 4.12.23

package/es5/jodit.js

@@ -1,7 +1,7 @@
 /*!
  * jodit-pro - PRO Version of Jodit Editor
  * Author: Chupurnov Valerii <chupurnov@gmail.com>
- * Version: v4.12.22
+ * Version: v4.12.23
  * Url: https://xdsoft.net/jodit/pro/
  * License(s): SEE LICENSE IN LICENSE.md
  */
@@ -2258,7 +2258,7 @@ function _unsupported_iterable_to_array(o, minLen) {
     if (n === "Map" || n === "Set") return Array.from(n);
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
-var APP_VERSION = "4.12.22";
+var APP_VERSION = "4.12.23";
 // prettier-ignore
 var ES = "es5";
 var IS_ES_MODERN = false;
@@ -9465,6 +9465,18 @@ function _unsupported_iterable_to_array(o, minLen) {
 
 
 
+/**
+ * Keys that must never be copied from a (potentially untrusted) config object —
+ * assigning them during a recursive merge can reach and mutate
+ * `Object.prototype` (prototype pollution, CWE-1321).
+ */ var UNSAFE_PROTO_KEYS = [
+    '__proto__',
+    'constructor',
+    'prototype'
+];
+function isUnsafeProtoKey(key) {
+    return UNSAFE_PROTO_KEYS.indexOf(key) !== -1;
+}
 /**
  * @example
  * ```js
@@ -9514,6 +9526,9 @@ function _unsupported_iterable_to_array(o, minLen) {
     }
     var newOpt = {};
     Object.keys(options).forEach(function(key) {
+        if (isUnsafeProtoKey(key)) {
+            return;
+        }
         var opt = options[key], protoKey = proto ? proto[key] : null;
         if ((0,_checker_is_plain_object_js__WEBPACK_IMPORTED_MODULE_1__.isPlainObject)(opt) && (0,_checker_is_plain_object_js__WEBPACK_IMPORTED_MODULE_1__.isPlainObject)(protoKey) && !(0,_extend_js__WEBPACK_IMPORTED_MODULE_5__.isAtom)(opt)) {
             newOpt[key] = ConfigProto(opt, protoKey, deep + 1);
@@ -9572,6 +9587,9 @@ function ConfigFlatten(obj) {
  * @see {@link ConfigProto} for the prototype-chain variant used at editor creation time
  */ function ConfigMerge(target, source) {
     Object.keys(source).forEach(function(key) {
+        if (isUnsafeProtoKey(key)) {
+            return;
+        }
         var srcVal = source[key];
         var tgtVal = target[key];
         if ((0,_checker_is_plain_object_js__WEBPACK_IMPORTED_MODULE_1__.isPlainObject)(srcVal) && (0,_checker_is_plain_object_js__WEBPACK_IMPORTED_MODULE_1__.isPlainObject)(tgtVal) && !(0,_extend_js__WEBPACK_IMPORTED_MODULE_5__.isAtom)(srcVal)) {
@@ -46193,7 +46211,11 @@ function filterStyleProperties(style, allowed) {
     if (!jodit.o.cleanHTML.removeEmptyElements) {
         return false;
     }
-    return _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isElement(node) && node.nodeName.match(_core_constants_js__WEBPACK_IMPORTED_MODULE_0__.IS_INLINE) != null && !_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isTemporary(node) && (0,_core_helpers_string_trim_js__WEBPACK_IMPORTED_MODULE_2__.trimInv)(node.innerHTML).length === 0 && (current == null || !_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isOrContains(node, current));
+    // Never drop an empty inline element that currently holds the caret — it is
+    // a pending-format marker the user is about to type into (#1291). `current`
+    // is captured before a click moves the caret, so also check the live caret.
+    var liveCaret = jodit.s.isCollapsed() ? jodit.s.range.startContainer : null;
+    return _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isElement(node) && node.nodeName.match(_core_constants_js__WEBPACK_IMPORTED_MODULE_0__.IS_INLINE) != null && !_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isTemporary(node) && (0,_core_helpers_string_trim_js__WEBPACK_IMPORTED_MODULE_2__.trimInv)(node.innerHTML).length === 0 && (current == null || !_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isOrContains(node, current)) && (liveCaret == null || !_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isOrContains(node, liveCaret));
 }
 
 
@@ -47681,6 +47703,9 @@ var DragState;
                 this.dragList = this.j.o.draggableTags ? (0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.splitArray)(this.j.o.draggableTags).filter(Boolean).map(function(item) {
                     return item.toLowerCase();
                 }) : [];
+                // Allow another plugin (e.g. a drag handle/anchor) to start dragging
+                // an element programmatically, regardless of the `draggableTags` list.
+                this.j.e.on('startDragElement', this.onStartDragElement);
                 if (!this.dragList.length) {
                     return;
                 }
@@ -47689,6 +47714,28 @@ var DragState;
         },
         {
             /**
+     * Start dragging a specific element programmatically.
+     *
+     * Allows a separate UI element (for example a drag handle/anchor shown next
+     * to a block) to initiate the drag without the user pressing directly on the
+     * draggable element itself.
+     *
+     * @example
+     * ```js
+     * handle.addEventListener('mousedown', e => {
+     * 	editor.e.fire('startDragElement', preBlock, e);
+     * });
+     * ```
+     */ key: "onStartDragElement",
+            value: function onStartDragElement(element, event) {
+                if (this.isInDestruct || this.state > DragState.IDLE || !element) {
+                    return;
+                }
+                this.startDragging(element, event);
+            }
+        },
+        {
+            /**
      * Drag start handler
      */ key: "onDragStart",
             value: function onDragStart(event) {
@@ -47713,11 +47760,21 @@ var DragState;
                 if (_core_dom_index_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isTag(lastTarget.parentElement, 'a') && lastTarget.parentElement.firstChild === lastTarget && lastTarget.parentElement.lastChild === lastTarget) {
                     lastTarget = lastTarget.parentElement;
                 }
+                this.startDragging(lastTarget, event);
+            }
+        },
+        {
+            /**
+     * Prepare the ghost element and switch to the waiting state.
+     * Shared by the native mousedown handler and the programmatic
+     * `startDragElement` event handler.
+     */ key: "startDragging",
+            value: function startDragging(target, event) {
                 this.startX = event.clientX;
                 this.startY = event.clientY;
                 this.isCopyMode = (0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.ctrlKey)(event); // we can move only element from editor
-                this.draggable = lastTarget.cloneNode(true);
-                (0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.dataBind)(this.draggable, 'target', lastTarget);
+                this.draggable = target.cloneNode(true);
+                (0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.dataBind)(this.draggable, 'target', target);
                 this.state = DragState.WAIT_DRAGGING;
                 this.addDragListeners();
             }
@@ -47796,6 +47853,18 @@ var DragState;
                 }
                 var parentElement = fragment.parentElement;
                 this.j.s.insertNode(fragment, true, false);
+                // Dropping a non-editable block (e.g. a `<pre>` code sample) can leave an
+                // invisible filler text node beside it. Remove it so the drop does not
+                // introduce a stray empty line (which clean-html would otherwise strip
+                // later, causing a flash).
+                [
+                    fragment.previousSibling,
+                    fragment.nextSibling
+                ].forEach(function(node) {
+                    if (_core_dom_index_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isEmptyTextNode(node)) {
+                        _core_dom_index_js__WEBPACK_IMPORTED_MODULE_1__.Dom.safeRemove(node);
+                    }
+                });
                 if (parentElement && _core_dom_index_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isEmpty(parentElement) && !_core_dom_index_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isCell(parentElement)) {
                     _core_dom_index_js__WEBPACK_IMPORTED_MODULE_1__.Dom.safeRemove(parentElement);
                 }
@@ -47831,13 +47900,16 @@ var DragState;
             /** @override */ key: "beforeDestruct",
             value: function beforeDestruct() {
                 this.onDragEnd();
-                this.j.e.off('mousedown dragstart', this.onDragStart);
+                this.j.e.off('mousedown dragstart', this.onDragStart).off('startDragElement', this.onStartDragElement);
                 this.removeDragListeners();
             }
         }
     ]);
     return dragAndDropElement;
 }(_wrap_native_super(_core_plugin_index_js__WEBPACK_IMPORTED_MODULE_4__.Plugin));
+__decorate([
+    _core_decorators_index_js__WEBPACK_IMPORTED_MODULE_0__.autobind
+], dragAndDropElement.prototype, "onStartDragElement", null);
 __decorate([
     _core_decorators_index_js__WEBPACK_IMPORTED_MODULE_0__.autobind
 ], dragAndDropElement.prototype, "onDragStart", null);
@@ -48802,18 +48874,24 @@ function _is_native_reflect_construct() {
         {
             key: "onEnterKeyDown",
             value: function onEnterKeyDown(event) {
+                var _this = this;
                 if (event.key === _core_constants_js__WEBPACK_IMPORTED_MODULE_0__.KEY_ENTER) {
                     var editor = this.j;
                     var beforeEnter = editor.e.fire('beforeEnter', event);
                     if (beforeEnter !== undefined) {
                         return beforeEnter;
                     }
-                    if (!editor.s.isCollapsed()) {
-                        editor.execCommand('Delete');
-                    }
-                    editor.s.focus();
-                    this.onEnter(event);
-                    editor.e.fire('afterEnter', event);
+                    // Delete-of-selection + new block must be a single history step,
+                    // otherwise pressing Enter over a selection needs two Ctrl+Z to undo
+                    // (the first only reverts to the intermediate empty state). #1292
+                    editor.history.snapshot.transaction(function() {
+                        if (!editor.s.isCollapsed()) {
+                            editor.execCommand('Delete');
+                        }
+                        editor.s.focus();
+                        _this.onEnter(event);
+                        editor.e.fire('afterEnter', event);
+                    });
                     editor.synchronizeValues(); // fire change
                     return false;
                 }
@@ -64062,13 +64140,14 @@ _config_js__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.select = {
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 /* unused harmony export select */
-/* harmony import */ var _core_decorators_index_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(65478);
-/* harmony import */ var _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(2748);
-/* harmony import */ var _core_global_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(580);
-/* harmony import */ var _core_helpers_string_camel_case_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(87058);
-/* harmony import */ var _core_plugin_index_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(50911);
-/* harmony import */ var _core_ui_index_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(67510);
-/* harmony import */ var _config_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(67215);
+/* harmony import */ var _core_constants_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(82758);
+/* harmony import */ var _core_decorators_index_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(65478);
+/* harmony import */ var _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(2748);
+/* harmony import */ var _core_global_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(580);
+/* harmony import */ var _core_helpers_string_camel_case_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(87058);
+/* harmony import */ var _core_plugin_index_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(50911);
+/* harmony import */ var _core_ui_index_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(67510);
+/* harmony import */ var _config_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(67215);
 function _assert_this_initialized(self) {
     if (self === void 0) {
         throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
@@ -64205,6 +64284,7 @@ function _is_native_reflect_construct() {
 
 
 
+
 /**
  * A utility plugin that allows you to subscribe to a click/mousedown/touchstart/mouseup on an element in DOM order
  *
@@ -64256,7 +64336,7 @@ function _is_native_reflect_construct() {
                 var j = this.j;
                 var result, target = e.target;
                 while(result === undefined && target && target !== j.editor){
-                    result = j.e.fire((0,_core_helpers_string_camel_case_js__WEBPACK_IMPORTED_MODULE_3__.camelCase)(e.type + '_' + target.nodeName.toLowerCase()), target, e);
+                    result = j.e.fire((0,_core_helpers_string_camel_case_js__WEBPACK_IMPORTED_MODULE_4__.camelCase)(e.type + '_' + target.nodeName.toLowerCase()), target, e);
                     target = target.parentElement;
                 }
                 if (e.type === 'click' && result === undefined && target === j.editor) {
@@ -64271,12 +64351,12 @@ function _is_native_reflect_construct() {
             value: function onOutsideClick(e) {
                 var _this = this;
                 var node = e.target;
-                if (_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.up(node, function(elm) {
+                if (_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.up(node, function(elm) {
                     return elm === _this.j.editor;
                 })) {
                     return;
                 }
-                var box = _core_ui_index_js__WEBPACK_IMPORTED_MODULE_5__.UIElement.closestElement(node, _core_ui_index_js__WEBPACK_IMPORTED_MODULE_5__.Popup);
+                var box = _core_ui_index_js__WEBPACK_IMPORTED_MODULE_6__.UIElement.closestElement(node, _core_ui_index_js__WEBPACK_IMPORTED_MODULE_6__.Popup);
                 if (!box) {
                     this.j.e.fire('outsideClick', e);
                 }
@@ -64288,7 +64368,7 @@ function _is_native_reflect_construct() {
                 var s = this.j.s;
                 if (!s.isCollapsed()) {
                     var current = s.current();
-                    if (current && _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isOrContains(this.j.editor, current)) {
+                    if (current && _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isOrContains(this.j.editor, current)) {
                         this.onCopyNormalizeSelectionBound();
                     }
                 }
@@ -64313,14 +64393,14 @@ function _is_native_reflect_construct() {
             value: function onClickRightOfNestedListItem(e) {
                 var s = this.j.s;
                 var range = s.range;
-                if (!range.collapsed || range.startOffset !== 0 || !_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isText(range.startContainer)) {
+                if (!range.collapsed || range.startOffset !== 0 || !_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isText(range.startContainer)) {
                     return;
                 }
                 var text = range.startContainer;
                 var li = text.parentNode;
                 // The text must be the direct content of a list item that has a nested
                 // list (the last level has no nested list and behaves correctly).
-                if (!_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isTag(li, 'li') || !(li.querySelector('ul') || li.querySelector('ol'))) {
+                if (!_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isTag(li, 'li') || !(li.querySelector('ul') || li.querySelector('ol'))) {
                     return;
                 }
                 var measure = this.j.ed.createRange();
@@ -64334,6 +64414,38 @@ function _is_native_reflect_construct() {
         },
         {
             /**
+     * Keep pending inline formatting after a click. Toggling Bold/Italic/etc. on
+     * a collapsed cursor leaves empty marker elements with the caret inside; a
+     * click puts the caret right before them (outside), so they get cleaned up
+     * and the formatting is lost. Move the caret back into the innermost marker
+     * so the next typed character keeps every pending format (#1291).
+     */ key: "onClickKeepPendingFormat",
+            value: function onClickKeepPendingFormat() {
+                var _a, _b;
+                var s = this.j.s;
+                var range = s.range;
+                if (!range.collapsed || !_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isText(range.startContainer)) {
+                    return;
+                }
+                var text = range.startContainer;
+                // Caret must sit at the very end of the text, right before the markers.
+                if (range.startOffset !== ((_b = (_a = text.nodeValue) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0)) {
+                    return;
+                }
+                var marker = text.nextSibling;
+                if (!_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isElement(marker) || !marker.nodeName.match(_core_constants_js__WEBPACK_IMPORTED_MODULE_0__.IS_INLINE) || !_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isEmpty(marker)) {
+                    return;
+                }
+                var inner = marker;
+                // Descend into the innermost empty formatting marker.
+                while(_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isElement(inner.firstElementChild) && inner.firstElementChild.nodeName.match(_core_constants_js__WEBPACK_IMPORTED_MODULE_0__.IS_INLINE)){
+                    inner = inner.firstElementChild;
+                }
+                s.setCursorIn(inner);
+            }
+        },
+        {
+            /**
      * Normalize selection after triple click
      */ key: "onTripleClickNormalizeSelection",
             value: function onTripleClickNormalizeSelection(e) {
@@ -64342,8 +64454,8 @@ function _is_native_reflect_construct() {
                 }
                 var s = this.j.s;
                 var _s_range = s.range, startContainer = _s_range.startContainer, startOffset = _s_range.startOffset;
-                if (startOffset === 0 && _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isText(startContainer)) {
-                    s.select(_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.closest(startContainer, _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isBlock, this.j.editor) || startContainer, true);
+                if (startOffset === 0 && _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isText(startContainer)) {
+                    s.select(_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.closest(startContainer, _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isBlock, this.j.editor) || startContainer, true);
                 }
             }
         },
@@ -64354,7 +64466,7 @@ function _is_native_reflect_construct() {
                 if (!o.select.normalizeSelectionBeforeCutAndCopy || s.isCollapsed()) {
                     return;
                 }
-                if (e && (!e.isTrusted || !_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isNode(e.target) || !_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__.Dom.isOrContains(editor, e.target))) {
+                if (e && (!e.isTrusted || !_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isNode(e.target) || !_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_2__.Dom.isOrContains(editor, e.target))) {
                     return;
                 }
                 this.jodit.s.expandSelection();
@@ -64362,40 +64474,45 @@ function _is_native_reflect_construct() {
         }
     ]);
     return select;
-}(_wrap_native_super(_core_plugin_index_js__WEBPACK_IMPORTED_MODULE_4__.Plugin));
+}(_wrap_native_super(_core_plugin_index_js__WEBPACK_IMPORTED_MODULE_5__.Plugin));
 __decorate([
-    _core_decorators_index_js__WEBPACK_IMPORTED_MODULE_0__.autobind
+    _core_decorators_index_js__WEBPACK_IMPORTED_MODULE_1__.autobind
 ], select.prototype, "onStartSelection", null);
 __decorate([
-    (0,_core_decorators_index_js__WEBPACK_IMPORTED_MODULE_0__.watch)('ow:click')
+    (0,_core_decorators_index_js__WEBPACK_IMPORTED_MODULE_1__.watch)('ow:click')
 ], select.prototype, "onOutsideClick", null);
 __decorate([
-    (0,_core_decorators_index_js__WEBPACK_IMPORTED_MODULE_0__.watch)([
+    (0,_core_decorators_index_js__WEBPACK_IMPORTED_MODULE_1__.watch)([
         ':beforeCommandCut'
     ])
 ], select.prototype, "beforeCommandCut", null);
 __decorate([
-    (0,_core_decorators_index_js__WEBPACK_IMPORTED_MODULE_0__.watch)([
+    (0,_core_decorators_index_js__WEBPACK_IMPORTED_MODULE_1__.watch)([
         ':beforeCommandSelectall'
     ])
 ], select.prototype, "beforeCommandSelectAll", null);
 __decorate([
-    (0,_core_decorators_index_js__WEBPACK_IMPORTED_MODULE_0__.watch)([
+    (0,_core_decorators_index_js__WEBPACK_IMPORTED_MODULE_1__.watch)([
         ':click'
     ])
 ], select.prototype, "onClickRightOfNestedListItem", null);
 __decorate([
-    (0,_core_decorators_index_js__WEBPACK_IMPORTED_MODULE_0__.watch)([
+    (0,_core_decorators_index_js__WEBPACK_IMPORTED_MODULE_1__.watch)([
+        ':click'
+    ])
+], select.prototype, "onClickKeepPendingFormat", null);
+__decorate([
+    (0,_core_decorators_index_js__WEBPACK_IMPORTED_MODULE_1__.watch)([
         ':click'
     ])
 ], select.prototype, "onTripleClickNormalizeSelection", null);
 __decorate([
-    (0,_core_decorators_index_js__WEBPACK_IMPORTED_MODULE_0__.watch)([
+    (0,_core_decorators_index_js__WEBPACK_IMPORTED_MODULE_1__.watch)([
         ':copy',
         ':cut'
     ])
 ], select.prototype, "onCopyNormalizeSelectionBound", null);
-_core_global_js__WEBPACK_IMPORTED_MODULE_2__.pluginSystem.add('select', select);
+_core_global_js__WEBPACK_IMPORTED_MODULE_3__.pluginSystem.add('select', select);
 
 
 /***/ }),

package/es5/jodit.min.css

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