jodit 4.17.2 → 4.17.4

package/es2021/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
  */
@@ -1799,7 +1799,7 @@ __webpack_require__.r(__webpack_exports__);
  * ```
  * @packageDocumentation
  * @module constants
- */ const APP_VERSION = "4.17.2";
+ */ const APP_VERSION = "4.17.4";
 // prettier-ignore
 const ES = "es2021";
 const IS_ES_MODERN = true;
@@ -6197,6 +6197,21 @@ function isSmuggledForeignHtml(elm) {
             jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.safeRemove(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.
+    const noscript = [];
+    jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.each(box, (node)=>{
+        if (jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isElement(node) && node.nodeName === 'NOSCRIPT') {
+            noscript.push(node);
+        }
+    });
+    for (const elm of noscript){
+        jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.safeRemove(elm);
+    }
     const removeEvents = options.removeEventAttributes ?? options.removeOnError;
     // Single synchronous traversal of the subtree. Besides removing event
     // handlers and `javascript:` links, `sanitizeHTMLElement` neutralises
@@ -17971,6 +17986,11 @@ class Jodit extends jodit_modules__WEBPACK_IMPORTED_MODULE_10__.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');
         }
     }
     /**
@@ -20768,6 +20788,16 @@ const 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.
+ */ const REPLACEABLE_ACTIONS = new Set([
+    'items',
+    'folder',
+    'permissions',
+    'getLocalFileByUrl'
+]);
 class DataProvider {
     /**
 	 * Alias for options
@@ -20776,10 +20806,19 @@ class DataProvider {
     }
     get(name) {
         const instances = this.__ajaxInstances;
-        if (instances.has(name)) {
-            const 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.
+        const replaceable = REPLACEABLE_ACTIONS.has(name);
+        const key = replaceable ? name : `${name}#${++this.__requestSerial}`;
+        if (replaceable && instances.has(key)) {
+            const ajax = instances.get(key);
             ajax?.abort();
-            instances.delete(name);
+            instances.delete(key);
         }
         const opts = (0,jodit_core_helpers_utils_config_proto__WEBPACK_IMPORTED_MODULE_8__.ConfigProto)(this.options[name] !== undefined ? this.options[name] : {}, (0,jodit_core_helpers_utils_config_proto__WEBPACK_IMPORTED_MODULE_8__.ConfigProto)({
             onProgress: this.progressHandler
@@ -20788,11 +20827,11 @@ class DataProvider {
             opts.data = opts.prepareData.call(this, opts.data);
         }
         const ajax = new jodit_core_request_ajax__WEBPACK_IMPORTED_MODULE_11__.Ajax(opts);
-        instances.set(name, ajax);
+        instances.set(key, ajax);
         const promise = ajax.send();
         promise.finally(()=>{
             ajax.destruct();
-            instances.delete(name);
+            instances.delete(key);
             this.progressHandler(100);
         }).catch(()=>null);
         return promise.then((resp)=>resp.json()).then((resp)=>{
@@ -21097,11 +21136,13 @@ class DataProvider {
         (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_0__._)(this, "options", void 0);
         (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_0__._)(this, "__currentPermissions", void 0);
         (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_0__._)(this, "__ajaxInstances", void 0);
+        (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_0__._)(this, "__requestSerial", void 0);
         (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_0__._)(this, "progressHandler", void 0);
         this.parent = parent;
         this.options = options;
         this.__currentPermissions = null;
         this.__ajaxInstances = new Map();
+        this.__requestSerial = 0;
         this.progressHandler = (ignore)=>{};
     }
 }
@@ -28752,6 +28793,15 @@ class cleanHtml extends jodit_core_plugin_plugin__WEBPACK_IMPORTED_MODULE_7__.Pl
             return false;
         }
     }
+    /**
+	 * 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.
+	 */ onAfterSetNativeEditorValue() {
+        ;(0,jodit_core_helpers_html_safe_html__WEBPACK_IMPORTED_MODULE_6__.safeHTML)(this.j.editor, this.j.o.cleanHTML);
+    }
     /**
 	 * Event handler when manually assigning a value to the HTML editor.
 	 */ onBeforeSetNativeEditorValue(data) {
@@ -28877,6 +28927,9 @@ class cleanHtml extends jodit_core_plugin_plugin__WEBPACK_IMPORTED_MODULE_7__.Pl
 (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_1__.__decorate)([
     (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_2__.watch)(':beforeCommand')
 ], cleanHtml.prototype, "beforeCommand", null);
+(0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_1__.__decorate)([
+    (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_2__.watch)(':afterSetNativeEditorValue')
+], cleanHtml.prototype, "onAfterSetNativeEditorValue", null);
 (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_1__.__decorate)([
     (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_2__.watch)(':beforeSetNativeEditorValue')
 ], cleanHtml.prototype, "onBeforeSetNativeEditorValue", null);