jodit 4.17.2 → 4.17.4

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.2
+ * Version: v4.17.4
  * 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.2";
+var APP_VERSION = "4.17.4";
 // prettier-ignore
 var ES = "es5";
 var IS_ES_MODERN = false;
@@ -7161,6 +7161,38 @@ function isSmuggledForeignHtml(elm) {
             }
         }
     }
+    // `<noscript>` is parsed as markup in a document with scripting off (the
+    // inert document the value is sanitized in) and as raw text in one with
+    // scripting on (the live editor). The same serialized bytes therefore
+    // describe two different trees, and markup hidden as inert text in the
+    // first comes alive as elements in the second. The element has no use in
+    // editor content, so it goes, together with everything it carried.
+    var noscript = [];
+    jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.each(box, function(node) {
+        if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isElement(node) && node.nodeName === 'NOSCRIPT') {
+            noscript.push(node);
+        }
+    });
+    var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
+    try {
+        for(var _iterator1 = noscript[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
+            var elm1 = _step1.value;
+            jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.safeRemove(elm1);
+        }
+    } catch (err) {
+        _didIteratorError1 = true;
+        _iteratorError1 = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
+                _iterator1.return();
+            }
+        } finally{
+            if (_didIteratorError1) {
+                throw _iteratorError1;
+            }
+        }
+    }
     var removeEvents = (_options_removeEventAttributes = options.removeEventAttributes) !== null && _options_removeEventAttributes !== void 0 ? _options_removeEventAttributes : options.removeOnError;
     // Single synchronous traversal of the subtree. Besides removing event
     // handlers and `javascript:` links, `sanitizeHTMLElement` neutralises
@@ -21907,6 +21939,11 @@ var Jodit = /*#__PURE__*/ function(ViewWithToolbar) {
                 }
                 if (this.editor) {
                     this.editor.innerHTML = data.value;
+                    // Fired synchronously, before any task can run: the value was
+                    // sanitized in an inert document and re-parsed here with scripting
+                    // on, and the two parsers do not always agree. Listeners get to
+                    // look at the tree that actually exists.
+                    this.e.fire('afterSetNativeEditorValue');
                 }
             }
         },
@@ -25127,6 +25164,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) {
@@ -25135,11 +25182,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, [
@@ -25156,10 +25205,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
@@ -25168,11 +25226,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;
@@ -34607,6 +34665,18 @@ var cleanHtml = /*#__PURE__*/ function(Plugin) {
                 }
             }
         },
+        {
+            key: "onAfterSetNativeEditorValue",
+            value: /**
+	 * The value was sanitized in an inert document and has just been re-parsed
+	 * into the live editor with scripting on. Where the two parsers disagree
+	 * (`<noscript>`, raw-text elements), markup that was inert text a moment
+	 * ago is a real element now, so the live tree is sanitized once more, in
+	 * the same call stack, before any handler it might carry can fire.
+	 */ function onAfterSetNativeEditorValue() {
+                ;(0,jodit_core_helpers_html_safe_html__WEBPACK_IMPORTED_MODULE_13__.safeHTML)(this.j.editor, this.j.o.cleanHTML);
+            }
+        },
         {
             key: "onBeforeSetNativeEditorValue",
             value: /**
@@ -34744,6 +34814,9 @@ var cleanHtml = /*#__PURE__*/ function(Plugin) {
 (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_7__.__decorate)([
+    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_9__.watch)(':afterSetNativeEditorValue')
+], cleanHtml.prototype, "onAfterSetNativeEditorValue", null);
 (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_7__.__decorate)([
     (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_9__.watch)(':beforeSetNativeEditorValue')
 ], cleanHtml.prototype, "onBeforeSetNativeEditorValue", 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.2
+ * Version: v4.17.4
  * 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.2
+ * Version: v4.17.4
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */