jodit 4.17.4 → 4.17.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.17.4
+ * Version: v4.17.6
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -2129,7 +2129,7 @@ __webpack_require__.r(__webpack_exports__);
  * @packageDocumentation
  * @module constants
  */ 
-var APP_VERSION = "4.17.4";
+var APP_VERSION = "4.17.6";
 // prettier-ignore
 var ES = "es5";
 var IS_ES_MODERN = false;
@@ -12309,6 +12309,12 @@ function findCorrectCurrentNode(node, range, rightMode, isCollapsed, checkChild,
 
 
 
+/**
+ * A text node that is empty or holds only invisible caret placeholders.
+ */ function isBlankTextNode(node) {
+    var _node_nodeValue;
+    return jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_10__.Dom.isText(node) && ((_node_nodeValue = node.nodeValue) !== null && _node_nodeValue !== void 0 ? _node_nodeValue : '').replace(jodit_core_constants__WEBPACK_IMPORTED_MODULE_8__.INVISIBLE_SPACE_REG_EXP(), '').length === 0;
+}
 var Selection = /*#__PURE__*/ function() {
     "use strict";
     function Selection(jodit) {
@@ -12464,6 +12470,23 @@ var Selection = /*#__PURE__*/ function() {
                 });
             }
         },
+        {
+            key: "__nativeRangeCount",
+            value: /**
+	 * How many ranges the browser's own selection holds right now, as opposed
+	 * to the composed view that [[sel]] may answer from.
+	 */ function __nativeRangeCount() {
+                var _ref;
+                var _this_win_getSelection;
+                var shadowRoot = this.j.o.shadowRoot;
+                if (shadowRoot && (0,jodit_core_helpers_checker__WEBPACK_IMPORTED_MODULE_12__.isFunction)(shadowRoot.getSelection)) {
+                    var _ref1;
+                    var _shadowRoot_getSelection;
+                    return (_ref1 = (_shadowRoot_getSelection = shadowRoot.getSelection()) === null || _shadowRoot_getSelection === void 0 ? void 0 : _shadowRoot_getSelection.rangeCount) !== null && _ref1 !== void 0 ? _ref1 : 0;
+                }
+                return (_ref = (_this_win_getSelection = this.win.getSelection()) === null || _this_win_getSelection === void 0 ? void 0 : _this_win_getSelection.rangeCount) !== null && _ref !== void 0 ? _ref : 0;
+            }
+        },
         {
             key: "range",
             get: /**
@@ -12624,10 +12647,22 @@ var Selection = /*#__PURE__*/ function() {
                 jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_10__.Dom.append(marker, this.j.createInside.text(jodit_core_constants__WEBPACK_IMPORTED_MODULE_8__.INVISIBLE_SPACE));
                 if (newRange) {
                     if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_10__.Dom.isOrContains(this.area, atStart ? newRange.startContainer : newRange.endContainer)) {
-                        // Here need do unsafe inserting
-                        // Deny Dom.safeInsertNode(newRange, marker);
-                        // Apply style -> Test Style module -> Base apply -> For selection <p><strong>|test|</strong></p> apply style {"element":"em","style":{"fontStyle":"italic"}}
-                        newRange.insertNode(marker);
+                        var _node_nodeValue;
+                        var node = newRange.startContainer, offset = newRange.startOffset;
+                        // At either end of a text node the marker goes beside it. Splitting
+                        // the node there would leave the selection's boundary in an empty
+                        // text node, and WebKit neither repaints a selection that leaves one
+                        // nor moves a selection that follows one when it's removed.
+                        if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_10__.Dom.isText(node) && offset === 0) {
+                            jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_10__.Dom.before(node, marker);
+                        } else if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_10__.Dom.isText(node) && offset === ((_node_nodeValue = node.nodeValue) === null || _node_nodeValue === void 0 ? void 0 : _node_nodeValue.length)) {
+                            jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_10__.Dom.after(node, marker);
+                        } else {
+                            // Here need do unsafe inserting
+                            // Deny Dom.safeInsertNode(newRange, marker);
+                            // Apply style -> Test Style module -> Base apply -> For selection <p><strong>|test|</strong></p> apply style {"element":"em","style":{"fontStyle":"italic"}}
+                            newRange.insertNode(marker);
+                        }
                     }
                 }
                 return marker;
@@ -13044,7 +13079,9 @@ var Selection = /*#__PURE__*/ function() {
                             }
                         ].forEach(function(getChildNode) {
                             var childNode = getChildNode();
-                            if (childNode && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_10__.Dom.isEmptyTextNode(childNode)) {
+                            // Only a text node left with nothing in it by the split
+                            // goes; one holding a space is content (`<b>a</b> |`).
+                            if (childNode && isBlankTextNode(childNode)) {
                                 jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_10__.Dom.safeRemove(childNode);
                             }
                         });
@@ -13465,6 +13502,16 @@ var Selection = /*#__PURE__*/ function() {
                     if (backward && ranges.length === 1) {
                         var range = ranges[0];
                         sel.setBaseAndExtent(range.endContainer, range.endOffset, range.startContainer, range.startOffset);
+                    } else if (ranges.length === 1 && !this.__nativeRangeCount() && (0,jodit_core_helpers_checker__WEBPACK_IMPORTED_MODULE_12__.isFunction)(sel.setBaseAndExtent)) {
+                        // `addRange` is specified to ignore a range whose root is not
+                        // the document, which is every range inside a shadow tree.
+                        // Chrome's `ShadowRoot.getSelection()` takes them anyway, but
+                        // Safari has only the window selection, so after
+                        // `removeAllRanges` the caret is simply gone: a character was
+                        // deleted and nothing was left to type into. `setBaseAndExtent`
+                        // does accept nodes inside a shadow tree.
+                        var range1 = ranges[0];
+                        sel.setBaseAndExtent(range1.startContainer, range1.startOffset, range1.endContainer, range1.endOffset);
                     }
                 }
                 /**
@@ -27078,19 +27125,27 @@ jodit_config__WEBPACK_IMPORTED_MODULE_10__.Config.prototype.history = {
 	 */ function updateStack() {
                 var replace = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : false;
                 var newValue = this.snapshot.make();
-                if (!_snapshot__WEBPACK_IMPORTED_MODULE_12__.Snapshot.equal(newValue, this.startValue)) {
-                    var newCommand = new _command__WEBPACK_IMPORTED_MODULE_11__.Command(this.startValue, newValue, this, this.updateTick);
-                    if (replace) {
-                        var command = this.__stack.current();
-                        if (command && this.updateTick === command.tick) {
-                            this.__stack.replace(newCommand);
-                        }
-                    } else {
-                        this.__stack.push(newCommand);
-                    }
+                if (_snapshot__WEBPACK_IMPORTED_MODULE_12__.Snapshot.equal(newValue, this.startValue)) {
+                    return;
+                }
+                // Only the selection moved, for example when the selection markers
+                // went in before a switch to the source view. There is nothing to
+                // undo, but the next change has to start from this selection.
+                if (newValue.html === this.startValue.html) {
                     this.startValue = newValue;
-                    this.fireChangeStack();
+                    return;
+                }
+                var newCommand = new _command__WEBPACK_IMPORTED_MODULE_11__.Command(this.startValue, newValue, this, this.updateTick);
+                if (replace) {
+                    var command = this.__stack.current();
+                    if (command && this.updateTick === command.tick) {
+                        this.__stack.replace(newCommand);
+                    }
+                } else {
+                    this.__stack.push(newCommand);
                 }
+                this.startValue = newValue;
+                this.fireChangeStack();
             }
         },
         {
@@ -44047,7 +44102,7 @@ var lineHeight = /*#__PURE__*/ function(Plugin) {
                 try {
                     if (s.isCollapsed()) {
                         var fake = c.fake();
-                        s.insertNode(fake, false, false);
+                        jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.safeInsertNode(s.range, fake);
                         apply(fake);
                         jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.safeRemove(fake);
                     } else {
@@ -46347,7 +46402,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.useInputsPlaceholder
                 _this.placeholderElm.innerHTML = (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_12__.attr)(editor.element, 'placeholder') || '';
             }
             editor.e.fire('placeholder', _this.placeholderElm.innerHTML);
-            editor.e.off('.placeholder').on('changePlace.placeholder', _this.addNativeListeners).on('change.placeholder focus.placeholder keyup.placeholder mouseup.placeholder keydown.placeholder ' + 'mousedown.placeholder afterSetMode.placeholder changePlace.placeholder ' + 'internalChange.placeholder', _this.toggle).on(window, 'load', _this.toggle);
+            editor.e.off('.placeholder').on('changePlace.placeholder', _this.addNativeListeners).on('change.placeholder focus.placeholder keyup.placeholder mouseup.placeholder keydown.placeholder ' + 'mousedown.placeholder afterSetMode.placeholder changePlace.placeholder ' + 'internalChange.placeholder afterCommand.placeholder', _this.toggle).on(window, 'load', _this.toggle);
             _this.addNativeListeners();
             _this.toggle();
         });
@@ -49790,7 +49845,11 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.select = {
             'touchstart',
             'mouseup',
             'touchend'
-        ]);
+        ]), /**
+	 * Where the last press started. Chrome reports a drag that begins in one
+	 * element and ends in another as a `click` on their common ancestor, so a
+	 * press inside a popup is remembered to tell such a drag from a real click.
+	 */ (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "__pressTarget", null);
         return _this;
     }
     ;(0,_swc_helpers_create_class__WEBPACK_IMPORTED_MODULE_2__._)(select, [
@@ -49826,18 +49885,30 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.select = {
                 }
             }
         },
+        {
+            key: "onOutsidePress",
+            value: function onOutsidePress(e) {
+                this.__pressTarget = e.target;
+            }
+        },
         {
             key: "onOutsideClick",
             value: /**
 	 * @event outsideClick(e) - when user clicked on the outside of editor
 	 */ function onOutsideClick(e) {
                 var _this = this;
-                var node = e.target;
+                var node = e.target, pressed = this.__pressTarget;
+                this.__pressTarget = null;
                 if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_9__.Dom.up(node, function(elm) {
                     return elm === _this.j.editor;
                 })) {
                     return;
                 }
+                // Selecting the text of a popup input with the mouse and releasing
+                // the button past the popup's edge is not a click outside of it.
+                if (pressed && jodit_core_ui__WEBPACK_IMPORTED_MODULE_13__.UIElement.closestElement(pressed, jodit_core_ui__WEBPACK_IMPORTED_MODULE_13__.Popup)) {
+                    return;
+                }
                 var box = jodit_core_ui__WEBPACK_IMPORTED_MODULE_13__.UIElement.closestElement(node, jodit_core_ui__WEBPACK_IMPORTED_MODULE_13__.Popup);
                 if (!box) {
                     this.j.e.fire('outsideClick', e);
@@ -49963,6 +50034,12 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.select = {
 (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_5__.__decorate)([
     jodit_core_decorators__WEBPACK_IMPORTED_MODULE_8__.autobind
 ], select.prototype, "onStartSelection", null);
+(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_5__.__decorate)([
+    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_8__.watch)([
+        'ow:mousedown',
+        'ow:touchstart'
+    ])
+], select.prototype, "onOutsidePress", null);
 (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_5__.__decorate)([
     (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_8__.watch)('ow:click')
 ], select.prototype, "onOutsideClick", null);
@@ -50347,10 +50424,12 @@ jodit_config__WEBPACK_IMPORTED_MODULE_2__.Config.prototype.controls.source = {
 /* harmony import */ var _swc_helpers_create_class__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(53429);
 /* 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 jodit_core_constants__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(81937);
-/* harmony import */ var jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(23211);
-/* harmony import */ var jodit_core_helpers__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(65946);
-/* harmony import */ var jodit_plugins_source_editor_sourceEditor__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(94193);
+/* harmony import */ var _swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(31635);
+/* harmony import */ var jodit_core_constants__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(81937);
+/* harmony import */ var jodit_core_decorators_autobind_autobind__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(49574);
+/* harmony import */ var jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(23211);
+/* harmony import */ var jodit_core_helpers__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(65946);
+/* harmony import */ var jodit_plugins_source_editor_sourceEditor__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(94193);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -50366,6 +50445,8 @@ jodit_config__WEBPACK_IMPORTED_MODULE_2__.Config.prototype.controls.source = {
 
 
 
+
+
 var AceEditor = /*#__PURE__*/ function(SourceEditor) {
     "use strict";
     (0,_swc_helpers_inherits__WEBPACK_IMPORTED_MODULE_4__._)(AceEditor, SourceEditor);
@@ -50380,7 +50461,7 @@ var AceEditor = /*#__PURE__*/ function(SourceEditor) {
             _this.j.e.fire('focus', e);
         }), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "proxyOnMouseDown", function(e) {
             _this.j.e.fire('mousedown', e);
-        });
+        }), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "__settingValue", false);
         return _this;
     }
     ;(0,_swc_helpers_create_class__WEBPACK_IMPORTED_MODULE_2__._)(AceEditor, [
@@ -50462,7 +50543,7 @@ var AceEditor = /*#__PURE__*/ function(SourceEditor) {
                         return;
                     }
                     var fakeMirror = _this.j.c.div('jodit-source__mirror-fake');
-                    jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_6__.Dom.append(_this.container, fakeMirror);
+                    jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_8__.Dom.append(_this.container, fakeMirror);
                     var ace = editor.ow.ace;
                     _this.instance = ace.edit(fakeMirror);
                     if (editor.o.direction === 'rtl') {
@@ -50483,15 +50564,15 @@ var AceEditor = /*#__PURE__*/ function(SourceEditor) {
                     _this.instance.setOption('wrap', editor.o.sourceEditorNativeOptions.wrap);
                     _this.instance.getSession().setUseWorker(false);
                     _this.instance.$blockScrolling = Infinity;
-                    _this.instance.on('change', _this.toWYSIWYG);
+                    _this.instance.on('change', _this.__onChange);
                     _this.instance.on('focus', _this.proxyOnFocus);
                     _this.instance.on('mousedown', _this.proxyOnMouseDown);
                     _this.instance.on('blur', _this.proxyOnBlur);
-                    if (editor.getRealMode() !== jodit_core_constants__WEBPACK_IMPORTED_MODULE_5__.MODE_WYSIWYG) {
+                    if (editor.getRealMode() !== jodit_core_constants__WEBPACK_IMPORTED_MODULE_6__.MODE_WYSIWYG) {
                         _this.setValue(_this.getValue());
                     }
                     var onResize = _this.j.async.throttle(function() {
-                        if (editor.isInDestruct || editor.getMode() === jodit_core_constants__WEBPACK_IMPORTED_MODULE_5__.MODE_WYSIWYG) {
+                        if (editor.isInDestruct || editor.getMode() === jodit_core_constants__WEBPACK_IMPORTED_MODULE_6__.MODE_WYSIWYG) {
                             return;
                         }
                         var hasFocus = _this.instance.isFocused();
@@ -50509,7 +50590,7 @@ var AceEditor = /*#__PURE__*/ function(SourceEditor) {
                 };
                 var loading = false;
                 var initAceEditor = function initAceEditor1() {
-                    if (editor.isInDestruct || editor.getRealMode() !== jodit_core_constants__WEBPACK_IMPORTED_MODULE_5__.MODE_SOURCE && editor.getMode() !== jodit_core_constants__WEBPACK_IMPORTED_MODULE_5__.MODE_SPLIT) {
+                    if (editor.isInDestruct || editor.getRealMode() !== jodit_core_constants__WEBPACK_IMPORTED_MODULE_6__.MODE_SOURCE && editor.getMode() !== jodit_core_constants__WEBPACK_IMPORTED_MODULE_6__.MODE_SPLIT) {
                         return;
                     }
                     // ACE (~400 KiB from the CDN) is only needed once the source view
@@ -50518,7 +50599,7 @@ var AceEditor = /*#__PURE__*/ function(SourceEditor) {
                     if (!_this.aceExists()) {
                         if (!loading) {
                             loading = true;
-                            (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_7__.loadNext)(editor, editor.o.sourceEditorCDNUrlsJS).then(initAceEditor).catch(function() {
+                            (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_9__.loadNext)(editor, editor.o.sourceEditorCDNUrlsJS).then(initAceEditor).catch(function() {
                                 return null;
                             });
                         }
@@ -50536,7 +50617,7 @@ var AceEditor = /*#__PURE__*/ function(SourceEditor) {
             key: "destruct",
             value: function destruct() {
                 var _this_j_events, _this_j;
-                this.instance.off('change', this.toWYSIWYG);
+                this.instance.off('change', this.__onChange);
                 this.instance.off('focus', this.proxyOnFocus);
                 this.instance.off('mousedown', this.proxyOnMouseDown);
                 this.instance.destroy();
@@ -50548,14 +50629,33 @@ var AceEditor = /*#__PURE__*/ function(SourceEditor) {
             value: function setValue(value) {
                 if (!this.j.o.editHTMLDocumentMode && this.j.o.beautifyHTML) {
                     var html = this.j.e.fire('beautifyHTML', value);
-                    if ((0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_7__.isString)(html)) {
+                    if ((0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_9__.isString)(html)) {
                         value = html;
                     }
                 }
-                this.instance.setValue(value);
+                // ACE reports its own `setValue` as two changes, the removal of the
+                // old text and the insertion of the new one. Fed back into the
+                // editor they became two history entries, `content -> ''` and
+                // `'' -> content`, so the first undo after a switch to the source
+                // view and back emptied the editor. The text came from the editor
+                // in the first place, so there is nothing to send back.
+                this.__settingValue = true;
+                try {
+                    this.instance.setValue(value);
+                } finally{
+                    this.__settingValue = false;
+                }
                 this.instance.clearSelection();
             }
         },
+        {
+            key: "__onChange",
+            value: function __onChange() {
+                if (!this.__settingValue) {
+                    this.toWYSIWYG();
+                }
+            }
+        },
         {
             key: "getValue",
             value: function getValue() {
@@ -50658,7 +50758,10 @@ var AceEditor = /*#__PURE__*/ function(SourceEditor) {
         }
     ]);
     return AceEditor;
-}(jodit_plugins_source_editor_sourceEditor__WEBPACK_IMPORTED_MODULE_8__.SourceEditor);
+}(jodit_plugins_source_editor_sourceEditor__WEBPACK_IMPORTED_MODULE_10__.SourceEditor);
+(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_5__.__decorate)([
+    jodit_core_decorators_autobind_autobind__WEBPACK_IMPORTED_MODULE_7__.autobind
+], AceEditor.prototype, "__onChange", null);
 
 
 /***/ }),

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