jodit 4.15.3 → 4.15.5

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.15.3
+ * Version: v4.15.5
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -1779,7 +1779,7 @@ __webpack_require__.r(__webpack_exports__);
  * ```
  * @packageDocumentation
  * @module constants
- */ const APP_VERSION = "4.15.3";
+ */ const APP_VERSION = "4.15.5";
 // prettier-ignore
 const ES = "es2021";
 const IS_ES_MODERN = true;
@@ -20416,17 +20416,20 @@ jodit_config__WEBPACK_IMPORTED_MODULE_5__.Config.prototype.controls.filebrowser
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "default": function() { return /* binding */ DataProvider; }
 /* harmony export */ });
+/* unused harmony export assertSourcesAnswer */
 /* harmony import */ var _swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(25045);
 /* harmony import */ var _swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(31635);
 /* harmony import */ var jodit_core_constants__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(81937);
 /* harmony import */ var jodit_core_decorators_autobind_autobind__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(49574);
-/* harmony import */ var jodit_core_helpers_checker_is_function__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(91565);
-/* harmony import */ var jodit_core_helpers_normalize_normalize_relative_path__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(96340);
-/* harmony import */ var jodit_core_helpers_utils_config_proto__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(77483);
-/* harmony import */ var jodit_core_helpers_utils_error__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(33201);
-/* harmony import */ var jodit_core_helpers_utils_set__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(52144);
-/* harmony import */ var jodit_core_request_ajax__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(17338);
-/* harmony import */ var jodit_modules_file_browser_builders_item__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(58664);
+/* harmony import */ var jodit_core_helpers_checker_is_array__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(17312);
+/* harmony import */ var jodit_core_helpers_checker_is_function__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(91565);
+/* harmony import */ var jodit_core_helpers_checker_is_plain_object__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(62101);
+/* harmony import */ var jodit_core_helpers_normalize_normalize_relative_path__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(96340);
+/* harmony import */ var jodit_core_helpers_utils_config_proto__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(77483);
+/* harmony import */ var jodit_core_helpers_utils_error__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(33201);
+/* harmony import */ var jodit_core_helpers_utils_set__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(52144);
+/* harmony import */ var jodit_core_request_ajax__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(17338);
+/* harmony import */ var jodit_modules_file_browser_builders_item__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(58664);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -20444,6 +20447,8 @@ jodit_config__WEBPACK_IMPORTED_MODULE_5__.Config.prototype.controls.filebrowser
 
 
 
+
+
 const DEFAULT_SOURCE_NAME = 'default';
 const possibleRules = new Set([
     'allowFiles',
@@ -20460,6 +20465,38 @@ const possibleRules = new Set([
     'allowImageResize',
     'allowImageCrop'
 ]);
+const DOCS_URL = 'https://xdsoft.net/jodit/docs/modules/file_browser.html';
+/**
+ * Validate the connector answer for the `files` / `folders` actions and
+ * normalise it. A hand-written backend that returns the wrong shape used to
+ * crash deep inside the UI with a bare `TypeError: ... reading 'forEach'`;
+ * now it fails right here with a message that names the action, the option
+ * and the missing field. Missing `files` / `folders` lists are treated as
+ * empty instead of throwing.
+ */ function assertSourcesAnswer(resp, action, option) {
+    const fail = (what)=>{
+        throw new Error(`File browser: the connector answer for action "${action}" (option "filebrowser.${option}") ${what}. See ${DOCS_URL}`);
+    };
+    if (!(0,jodit_core_helpers_checker_is_plain_object__WEBPACK_IMPORTED_MODULE_6__.isPlainObject)(resp) || !(0,jodit_core_helpers_checker_is_plain_object__WEBPACK_IMPORTED_MODULE_6__.isPlainObject)(resp.data)) {
+        return fail('has no "data" object');
+    }
+    const { sources } = resp.data;
+    if (!(0,jodit_core_helpers_checker_is_array__WEBPACK_IMPORTED_MODULE_4__.isArray)(sources)) {
+        return fail(sources === undefined ? 'has no "data.sources" array' : `must contain "data.sources" as an array of sources, got ${(0,jodit_core_helpers_checker_is_plain_object__WEBPACK_IMPORTED_MODULE_6__.isPlainObject)(sources) ? 'an object keyed by source name' : typeof sources}`);
+    }
+    sources.forEach((source, index)=>{
+        if (!(0,jodit_core_helpers_checker_is_plain_object__WEBPACK_IMPORTED_MODULE_6__.isPlainObject)(source)) {
+            return fail(`has a non-object entry at "data.sources[${index}]"`);
+        }
+        if (!(0,jodit_core_helpers_checker_is_array__WEBPACK_IMPORTED_MODULE_4__.isArray)(source.files)) {
+            source.files = [];
+        }
+        if (!(0,jodit_core_helpers_checker_is_array__WEBPACK_IMPORTED_MODULE_4__.isArray)(source.folders)) {
+            source.folders = [];
+        }
+    });
+    return resp;
+}
 class DataProvider {
     /**
 	 * Alias for options
@@ -20473,13 +20510,13 @@ class DataProvider {
             ajax?.abort();
             instances.delete(name);
         }
-        const opts = (0,jodit_core_helpers_utils_config_proto__WEBPACK_IMPORTED_MODULE_6__.ConfigProto)(this.options[name] !== undefined ? this.options[name] : {}, (0,jodit_core_helpers_utils_config_proto__WEBPACK_IMPORTED_MODULE_6__.ConfigProto)({
+        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
         }, this.o.ajax));
         if (opts.prepareData) {
             opts.data = opts.prepareData.call(this, opts.data);
         }
-        const ajax = new jodit_core_request_ajax__WEBPACK_IMPORTED_MODULE_9__.Ajax(opts);
+        const ajax = new jodit_core_request_ajax__WEBPACK_IMPORTED_MODULE_11__.Ajax(opts);
         instances.set(name, ajax);
         const promise = ajax.send();
         promise.finally(()=>{
@@ -20508,7 +20545,7 @@ class DataProvider {
         if (this.o.permissions.url) {
             return this.get('permissions').then((resp)=>{
                 if (this.parent.isInDestruct) {
-                    throw (0,jodit_core_helpers_utils_error__WEBPACK_IMPORTED_MODULE_7__.abort)();
+                    throw (0,jodit_core_helpers_utils_error__WEBPACK_IMPORTED_MODULE_9__.abort)();
                 }
                 let process = this.o.permissions.process;
                 if (!process) {
@@ -20516,7 +20553,9 @@ class DataProvider {
                 }
                 if (process) {
                     const respData = process.call(self, resp);
-                    if (respData.data.permissions) {
+                    // The permissions answer is optional and may come back without
+                    // a `data` object at all from a minimal backend.
+                    if (respData?.data?.permissions) {
                         this.parent.events.fire(this, 'changePermissions', this.__currentPermissions, respData.data.permissions);
                         this.__currentPermissions = respData.data.permissions;
                     }
@@ -20530,7 +20569,7 @@ class DataProvider {
         const rule = 'allow' + action;
         if (!jodit_core_constants__WEBPACK_IMPORTED_MODULE_2__.IS_PROD) {
             if (!possibleRules.has(rule)) {
-                throw (0,jodit_core_helpers_utils_error__WEBPACK_IMPORTED_MODULE_7__.error)('Wrong action ' + action);
+                throw (0,jodit_core_helpers_utils_error__WEBPACK_IMPORTED_MODULE_9__.error)('Wrong action ' + action);
             }
         }
         const presetValue = this.o.permissionsPresets[rule];
@@ -20555,7 +20594,7 @@ class DataProvider {
             if (process) {
                 resp = process.call(self, resp);
             }
-            return onResult(resp);
+            return onResult(assertSourcesAnswer(resp, 'files', 'items'));
         });
     }
     /**
@@ -20579,12 +20618,12 @@ class DataProvider {
         sources.forEach((source)=>{
             if (source.files && source.files.length) {
                 const { sort } = this.o;
-                if ((0,jodit_core_helpers_checker_is_function__WEBPACK_IMPORTED_MODULE_4__.isFunction)(sort) && mods.sortBy) {
+                if ((0,jodit_core_helpers_checker_is_function__WEBPACK_IMPORTED_MODULE_5__.isFunction)(sort) && mods.sortBy) {
                     source.files.sort((a, b)=>sort(a, b, mods.sortBy));
                 }
                 source.files.forEach((item)=>{
                     if (inFilter(item) && canBeFile(item)) {
-                        elements.push(jodit_modules_file_browser_builders_item__WEBPACK_IMPORTED_MODULE_10__.FileBrowserItem.create({
+                        elements.push(jodit_modules_file_browser_builders_item__WEBPACK_IMPORTED_MODULE_12__.FileBrowserItem.create({
                             ...item,
                             sourceName: source.name,
                             source
@@ -20596,7 +20635,7 @@ class DataProvider {
         return elements;
     }
     async tree(path, source) {
-        path = (0,jodit_core_helpers_normalize_normalize_relative_path__WEBPACK_IMPORTED_MODULE_5__.normalizeRelativePath)(path);
+        path = (0,jodit_core_helpers_normalize_normalize_relative_path__WEBPACK_IMPORTED_MODULE_7__.normalizeRelativePath)(path);
         if (!this.o.folder) {
             return Promise.reject(Error('Set Folder Api options'));
         }
@@ -20611,18 +20650,18 @@ class DataProvider {
             if (process) {
                 resp = process.call(self, resp);
             }
-            return resp.data.sources;
+            return assertSourcesAnswer(resp, 'folders', 'folder').data.sources;
         });
     }
     /**
 	 * Get path by url. You can use this method in another modules
 	 */ getPathByUrl(url) {
-        ;(0,jodit_core_helpers_utils_set__WEBPACK_IMPORTED_MODULE_8__.set)('options.getLocalFileByUrl.data.url', url, this);
+        ;(0,jodit_core_helpers_utils_set__WEBPACK_IMPORTED_MODULE_10__.set)('options.getLocalFileByUrl.data.url', url, this);
         return this.get('getLocalFileByUrl').then((resp)=>{
             if (this.isSuccess(resp)) {
                 return resp.data;
             }
-            throw (0,jodit_core_helpers_utils_error__WEBPACK_IMPORTED_MODULE_7__.error)(this.getMessage(resp));
+            throw (0,jodit_core_helpers_utils_error__WEBPACK_IMPORTED_MODULE_9__.error)(this.getMessage(resp));
         });
     }
     /**
@@ -20634,7 +20673,7 @@ class DataProvider {
 	 */ createFolder(name, path, source) {
         const { create } = this.o;
         if (!create) {
-            throw (0,jodit_core_helpers_utils_error__WEBPACK_IMPORTED_MODULE_7__.error)('Set Create api options');
+            throw (0,jodit_core_helpers_utils_error__WEBPACK_IMPORTED_MODULE_9__.error)('Set Create api options');
         }
         create.data.source = source;
         create.data.path = path;
@@ -20643,7 +20682,7 @@ class DataProvider {
             if (this.isSuccess(resp)) {
                 return true;
             }
-            throw (0,jodit_core_helpers_utils_error__WEBPACK_IMPORTED_MODULE_7__.error)(this.getMessage(resp));
+            throw (0,jodit_core_helpers_utils_error__WEBPACK_IMPORTED_MODULE_9__.error)(this.getMessage(resp));
         });
     }
     /**
@@ -20655,7 +20694,7 @@ class DataProvider {
         const mode = isFile ? 'fileMove' : 'folderMove';
         const option = this.options[mode];
         if (!option) {
-            throw (0,jodit_core_helpers_utils_error__WEBPACK_IMPORTED_MODULE_7__.error)('Set Move api options');
+            throw (0,jodit_core_helpers_utils_error__WEBPACK_IMPORTED_MODULE_9__.error)('Set Move api options');
         }
         option.data.from = filepath;
         option.data.path = path;
@@ -20664,7 +20703,7 @@ class DataProvider {
             if (this.isSuccess(resp)) {
                 return true;
             }
-            throw (0,jodit_core_helpers_utils_error__WEBPACK_IMPORTED_MODULE_7__.error)(this.getMessage(resp));
+            throw (0,jodit_core_helpers_utils_error__WEBPACK_IMPORTED_MODULE_9__.error)(this.getMessage(resp));
         });
     }
     /**
@@ -20676,7 +20715,7 @@ class DataProvider {
 	 */ __remove(action, path, file, source) {
         const fr = this.o[action];
         if (!fr) {
-            throw (0,jodit_core_helpers_utils_error__WEBPACK_IMPORTED_MODULE_7__.error)(`Set "${action}" api options`);
+            throw (0,jodit_core_helpers_utils_error__WEBPACK_IMPORTED_MODULE_9__.error)(`Set "${action}" api options`);
         }
         fr.data.path = path;
         fr.data.name = file;
@@ -20716,7 +20755,7 @@ class DataProvider {
 	 */ __rename(action, path, name, newname, source) {
         const fr = this.o[action];
         if (!fr) {
-            throw (0,jodit_core_helpers_utils_error__WEBPACK_IMPORTED_MODULE_7__.error)(`Set "${action}" api options`);
+            throw (0,jodit_core_helpers_utils_error__WEBPACK_IMPORTED_MODULE_9__.error)(`Set "${action}" api options`);
         }
         fr.data.path = path;
         fr.data.name = name;
@@ -28348,6 +28387,7 @@ jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_5__.Icon.set('class-span', (_class_s
 	 * `<p><br></p>` left after deleting all content) to an empty string —
 	 * opt-in via `cleanHTML.collapseEmptyValueToEmptyString`. See #1149
 	 */ onAfterGetValueFromEditor(data) {
+        this.__singleQuotesInFontFamily(data);
         if (!this.j.o.cleanHTML.collapseEmptyValueToEmptyString) {
             return;
         }
@@ -28355,6 +28395,27 @@ jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_5__.Icon.set('class-span', (_class_s
             data.value = '';
         }
     }
+    /**
+	 * Rewrite double-quoted font names inside `style` attributes with single
+	 * quotes. The DOM always serialises them as `&quot;…&quot;`, and back ends
+	 * that HTML-decode the value before storing it then produce
+	 * `style="font-family: "Open Sans", …"` — broken markup. Single quotes
+	 * survive that round trip. Names that already contain an apostrophe are
+	 * left alone.
+	 */ __singleQuotesInFontFamily(data) {
+        if (!this.j.o.cleanHTML.singleQuotesInFontFamily || !data.value.includes('&quot;')) {
+            return;
+        }
+        data.value = data.value.replace(/\sstyle="([^"]*)"/gi, (attribute, css)=>{
+            if (!css.includes('&quot;') || !/font-family/i.test(css)) {
+                return attribute;
+            }
+            const normalized = css.replace(// `&quot;` itself ends with `;`, so the entity has to be
+            // consumed as a unit or the declaration stops inside it.
+            /font-family\s*:(?:&quot;|[^;])*/gi, (declaration)=>declaration.includes("'") ? declaration : declaration.replace(/&quot;/g, "'"));
+            return attribute.replace(css, normalized);
+        });
+    }
     onSafeHTML(sandBox) {
         const sanitizer = this.j.o.cleanHTML.sanitizer;
         if (sanitizer) {
@@ -28427,6 +28488,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_1__.Config.prototype.cleanHTML = {
     removeEmptyElements: true,
     fillEmptyParagraph: true,
     collapseEmptyValueToEmptyString: false,
+    singleQuotesInFontFamily: true,
     replaceNBSP: true,
     replaceOldTags: {
         i: 'em',