jodit 4.17.3 → 4.17.5

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.3
+ * Version: v4.17.5
  * 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.3";
+var APP_VERSION = "4.17.5";
 // prettier-ignore
 var ES = "es5";
 var IS_ES_MODERN = false;
@@ -12464,6 +12464,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: /**
@@ -13465,6 +13482,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);
                     }
                 }
                 /**
@@ -25164,6 +25191,16 @@ var DOCS_URL = 'https://xdsoft.net/jodit/docs/modules/file_browser.html';
     });
     return resp;
 }
+/**
+ * Actions that only read from the connector. A newer request for one of them
+ * makes the older one pointless, so it is aborted; every other action changes
+ * server state and must be allowed to finish.
+ */ var REPLACEABLE_ACTIONS = new Set([
+    'items',
+    'folder',
+    'permissions',
+    'getLocalFileByUrl'
+]);
 var DataProvider = /*#__PURE__*/ function() {
     "use strict";
     function DataProvider(parent, options) {
@@ -25172,11 +25209,13 @@ var DataProvider = /*#__PURE__*/ function() {
         (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(this, "options", void 0);
         (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(this, "__currentPermissions", void 0);
         (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(this, "__ajaxInstances", void 0);
+        (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(this, "__requestSerial", void 0);
         (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(this, "progressHandler", void 0);
         this.parent = parent;
         this.options = options;
         this.__currentPermissions = null;
         this.__ajaxInstances = new Map();
+        this.__requestSerial = 0;
         this.progressHandler = function(ignore) {};
     }
     ;(0,_swc_helpers_create_class__WEBPACK_IMPORTED_MODULE_2__._)(DataProvider, [
@@ -25193,10 +25232,19 @@ var DataProvider = /*#__PURE__*/ function() {
             value: function get(name) {
                 var _this = this;
                 var instances = this.__ajaxInstances;
-                if (instances.has(name)) {
-                    var ajax = instances.get(name);
+                // A listing asked for again supersedes the one still loading, so the
+                // earlier request is aborted. That must never happen to a request
+                // that changes something on the server: aborting it does not undo it,
+                // the caller just never hears the result. Removing several files at
+                // once used to send one `fileRemove` per file and abort all but the
+                // last, so only the last one was ever removed. Mutating requests get a
+                // key of their own and run side by side.
+                var replaceable = REPLACEABLE_ACTIONS.has(name);
+                var key = replaceable ? name : "".concat(name, "#").concat(++this.__requestSerial);
+                if (replaceable && instances.has(key)) {
+                    var ajax = instances.get(key);
                     ajax === null || ajax === void 0 ? void 0 : ajax.abort();
-                    instances.delete(name);
+                    instances.delete(key);
                 }
                 var opts = (0,jodit_core_helpers_utils_config_proto__WEBPACK_IMPORTED_MODULE_15__.ConfigProto)(this.options[name] !== undefined ? this.options[name] : {}, (0,jodit_core_helpers_utils_config_proto__WEBPACK_IMPORTED_MODULE_15__.ConfigProto)({
                     onProgress: this.progressHandler
@@ -25205,11 +25253,11 @@ var DataProvider = /*#__PURE__*/ function() {
                     opts.data = opts.prepareData.call(this, opts.data);
                 }
                 var ajax1 = new jodit_core_request_ajax__WEBPACK_IMPORTED_MODULE_18__.Ajax(opts);
-                instances.set(name, ajax1);
+                instances.set(key, ajax1);
                 var promise = ajax1.send();
                 promise.finally(function() {
                     ajax1.destruct();
-                    instances.delete(name);
+                    instances.delete(key);
                     _this.progressHandler(100);
                 }).catch(function() {
                     return null;
@@ -49769,7 +49817,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, [
@@ -49805,18 +49857,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);
@@ -49942,6 +50006,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);

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