jodit 3.18.2 → 3.18.5

package/build/vdom.css

@@ -1,7 +1,7 @@
 /*!
  * jodit - Jodit is awesome and usefully wysiwyg editor with filebrowser
  * Author: Chupurnov <chupurnov@gmail.com> (https://xdsoft.net/)
- * Version: v3.18.2
+ * Version: v3.18.5
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */

package/build/vdom.js

@@ -1,7 +1,7 @@
 /*!
  * jodit - Jodit is awesome and usefully wysiwyg editor with filebrowser
  * Author: Chupurnov <chupurnov@gmail.com> (https://xdsoft.net/)
- * Version: v3.18.2
+ * Version: v3.18.5
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -834,9 +834,11 @@ var Async = (function () {
                 return promise;
             };
         }
-        promise.finally(function () {
+        promise
+            .finally(function () {
             _this.promisesRejections.delete(rejectCallback);
-        });
+        })
+            .catch(function () { return null; });
         promise.rejectCallback = rejectCallback;
         return promise;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "jodit",
-	"version": "3.18.2",
+	"version": "3.18.5",
 	"description": "Jodit is awesome and usefully wysiwyg editor with filebrowser",
 	"main": "build/jodit.min.js",
 	"types": "./types/index.d.ts",

package/src/config.ts

@@ -584,7 +584,11 @@ export class Config implements IViewOptions {
 	 * <JoditEditor config={config}/>
 	 * ```
 	 */
-	createAttributes: IDictionary<Attributes | NodeFunction> = {};
+	createAttributes: IDictionary<Attributes | NodeFunction> = {
+		table: {
+			style: 'border-collapse:collapse;width: 100%;'
+		}
+	};
 
 	/**
 	 * The width of the editor, accepted as the biggest. Used to the responsive version of the editor

package/src/core/async/async.ts

@@ -228,9 +228,11 @@ export class Async implements IAsync {
 			};
 		}
 
-		promise.finally(() => {
-			this.promisesRejections.delete(rejectCallback);
-		});
+		promise
+			.finally(() => {
+				this.promisesRejections.delete(rejectCallback);
+			})
+			.catch(() => null);
 
 		(promise as RejectablePromise<T>).rejectCallback = rejectCallback;
 

package/src/core/helpers/html/safe-html.ts

@@ -4,6 +4,10 @@
  * Copyright (c) 2013-2022 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
  */
 
+/**
+ * @module helpers/html
+ */
+
 import { $$, attr } from '../utils';
 import { Dom } from 'jodit/core/dom/dom';
 

package/src/core/helpers/utils/error/error.ts

@@ -0,0 +1,34 @@
+/*!
+ * Jodit Editor (https://xdsoft.net/jodit/)
+ * Released under MIT see LICENSE.txt in the project root for license information.
+ * Copyright (c) 2013-2022 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
+ */
+
+/**
+ * @module helpers/utils
+ */
+
+import { AbortError, ConnectionError, OptionsError } from './errors';
+
+/**
+ * Helper for create Error object
+ */
+export function error(message: string): Error {
+	return new TypeError(message);
+}
+
+export function connection(message: string): Error {
+	return new ConnectionError(message);
+}
+
+export function options(message: string): Error {
+	return new OptionsError(message);
+}
+
+export function abort(message: string): Error {
+	return new AbortError(message);
+}
+
+export function isAbort(error: unknown): boolean {
+	return error instanceof AbortError;
+}

package/src/core/helpers/utils/error/errors/abort-error.ts

@@ -0,0 +1,16 @@
+/*!
+ * Jodit Editor (https://xdsoft.net/jodit/)
+ * Released under MIT see LICENSE.txt in the project root for license information.
+ * Copyright (c) 2013-2022 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
+ */
+
+/**
+ * @module helpers/utils
+ */
+
+export class AbortError extends Error {
+	constructor(m: string) {
+		super(m);
+		Object.setPrototypeOf(this, AbortError.prototype);
+	}
+}

package/src/core/helpers/utils/error/errors/connection-error.ts

@@ -0,0 +1,16 @@
+/*!
+ * Jodit Editor (https://xdsoft.net/jodit/)
+ * Released under MIT see LICENSE.txt in the project root for license information.
+ * Copyright (c) 2013-2022 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
+ */
+
+/**
+ * @module helpers/utils
+ */
+
+export class ConnectionError extends Error {
+	constructor(m: string) {
+		super(m);
+		Object.setPrototypeOf(this, ConnectionError.prototype);
+	}
+}

package/src/core/helpers/utils/{error.ts → error/errors/index.ts}

@@ -8,9 +8,6 @@
  * @module helpers/utils
  */
 
-/**
- * Helper for create Error object
- */
-export function error(message: string): Error {
-	return new TypeError(message);
-}
+export * from './abort-error';
+export * from './connection-error';
+export * from './options-error';

package/src/core/helpers/utils/error/errors/options-error.ts

@@ -0,0 +1,16 @@
+/*!
+ * Jodit Editor (https://xdsoft.net/jodit/)
+ * Released under MIT see LICENSE.txt in the project root for license information.
+ * Copyright (c) 2013-2022 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
+ */
+
+/**
+ * @module helpers/utils
+ */
+
+export class OptionsError extends TypeError {
+	constructor(m: string) {
+		super(m);
+		Object.setPrototypeOf(this, OptionsError.prototype);
+	}
+}

package/{types/core/helpers/utils/error.d.ts → src/core/helpers/utils/error/index.ts}

@@ -3,10 +3,10 @@
  * Released under MIT see LICENSE.txt in the project root for license information.
  * Copyright (c) 2013-2022 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
  */
+
 /**
  * @module helpers/utils
  */
-/**
- * Helper for create Error object
- */
-export declare function error(message: string): Error;
+
+export * from './error';
+export * from './errors/';

package/src/core/helpers/utils/reset.ts

@@ -4,6 +4,10 @@
  * Copyright (c) 2013-2022 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
  */
 
+/**
+ * @module helpers/utils
+ */
+
 import type { IDictionary, Nullable } from 'jodit/types';
 import { get } from './get';
 import { isFunction } from '../checker/is-function';

package/src/core/helpers/utils/scroll-into-view.ts

@@ -4,6 +4,10 @@
  * Copyright (c) 2013-2022 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
  */
 
+/**
+ * @module helpers/utils
+ */
+
 import { Dom } from 'jodit/core/dom/dom';
 import type { Nullable } from 'jodit/types';
 

package/src/core/request/ajax.ts

@@ -23,7 +23,6 @@ import type {
 import { Config } from 'jodit/config';
 
 import {
-	error,
 	isPlainObject,
 	parseQuery,
 	buildQuery,
@@ -31,6 +30,7 @@ import {
 	isFunction,
 	ConfigProto
 } from 'jodit/core/helpers';
+import * as error from 'jodit/core/helpers/utils/error';
 import { Response } from './response';
 
 import './config';
@@ -83,14 +83,19 @@ export class Ajax<T extends object = any> implements IAjax<T> {
 	}
 
 	abort(): Ajax {
+		if (this.isFulfilled) {
+			return this;
+		}
+
 		try {
+			this.isFulfilled = true;
 			this.xhr.abort();
 		} catch {}
 
 		return this;
 	}
 
-	private resolved = false;
+	private isFulfilled = false;
 
 	private activated = false;
 
@@ -103,11 +108,12 @@ export class Ajax<T extends object = any> implements IAjax<T> {
 
 		return this.j.async.promise((resolve, reject) => {
 			const onReject = (): void => {
-				reject(error('Connection error'));
+				this.isFulfilled = true;
+				reject(error.connection('Connection error'));
 			};
 
 			const onResolve = (): void => {
-				this.resolved = true;
+				this.isFulfilled = true;
 
 				resolve(
 					new Response<T>(
@@ -120,7 +126,11 @@ export class Ajax<T extends object = any> implements IAjax<T> {
 			};
 
 			xhr.onload = onResolve;
-			xhr.onabort = onReject;
+			xhr.onabort = (): void => {
+				this.isFulfilled = true;
+				reject(error.abort('Abort connection'));
+			};
+
 			xhr.onerror = onReject;
 			xhr.ontimeout = onReject;
 
@@ -144,8 +154,9 @@ export class Ajax<T extends object = any> implements IAjax<T> {
 				if (xhr.readyState === XMLHttpRequest.DONE) {
 					if (o.successStatuses.includes(xhr.status)) {
 						onResolve();
-					} else {
-						reject(error(xhr.statusText || 'Connection error'));
+					} else if (xhr.statusText) {
+						this.isFulfilled = true;
+						reject(error.connection(xhr.statusText));
 					}
 				}
 			};
@@ -177,7 +188,7 @@ export class Ajax<T extends object = any> implements IAjax<T> {
 
 	prepareRequest(): IRequest {
 		if (!this.o.url) {
-			throw error('Need URL for AJAX request');
+			throw error.error('Need URL for AJAX request');
 		}
 
 		let url: string = this.o.url;
@@ -192,7 +203,7 @@ export class Ajax<T extends object = any> implements IAjax<T> {
 				const urlData = parseQuery(url);
 
 				url =
-					url.substr(0, qIndex) +
+					url.substring(0, qIndex) +
 					'?' +
 					buildQuery({ ...urlData, ...(data as IDictionary) });
 			} else {
@@ -213,9 +224,9 @@ export class Ajax<T extends object = any> implements IAjax<T> {
 	}
 
 	destruct(): void {
-		if (this.activated && !this.resolved) {
+		if (this.activated && !this.isFulfilled) {
 			this.abort();
-			this.resolved = true;
+			this.isFulfilled = true;
 		}
 	}
 }

package/src/modules/file-browser/data-provider.ts

@@ -106,12 +106,14 @@ export default class DataProvider implements IFileBrowserDataProvider {
 
 		const promise = ajax.send();
 
-		promise.finally(() => {
-			ajax.destruct();
-			ai.delete(name);
+		promise
+			.finally(() => {
+				ajax.destruct();
+				ai.delete(name);
 
-			this.progressHandler(100);
-		});
+				this.progressHandler(100);
+			})
+			.catch(() => null);
 
 		return promise
 			.then(resp => resp.json())
@@ -155,7 +157,7 @@ export default class DataProvider implements IFileBrowserDataProvider {
 				}
 
 				if (process) {
-					const respData: IFileBrowserAnswer = process.call(
+					const respData = process.call(
 						self,
 						resp
 					) as IFileBrowserAnswer;
@@ -191,7 +193,7 @@ export default class DataProvider implements IFileBrowserDataProvider {
 	/**
 	 * Load items list by path and source
 	 */
-	async items(
+	items(
 		path: string,
 		source: string,
 		mods: IFileBrowserDataProviderItemsMods = {}
@@ -262,12 +264,12 @@ export default class DataProvider implements IFileBrowserDataProvider {
 	async tree(path: string, source: string): Promise<ISourcesFiles> {
 		path = normalizeRelativePath(path);
 
-		await this.permissions(path, source);
-
 		if (!this.o.folder) {
 			return Promise.reject('Set Folder Api options');
 		}
 
+		await this.permissions(path, source);
+
 		this.o.folder.data.path = path;
 		this.o.folder.data.source = source;
 

package/src/modules/file-browser/fetch/load-items.ts

@@ -13,7 +13,7 @@ import type { IFileBrowser } from 'jodit/types';
 /**
  * Loads a list of files and adds them to the state
  */
-export async function loadItems(fb: IFileBrowser): Promise<any> {
+export function loadItems(fb: IFileBrowser): Promise<any> {
 	fb.files.setMod('active', true);
 	fb.files.setMod('loading', true);
 
@@ -24,8 +24,10 @@ export async function loadItems(fb: IFileBrowser): Promise<any> {
 			filterWord: fb.state.filterWord
 		})
 		.then(resp => {
-			fb.state.elements = resp;
-			fb.state.activeElements = [];
+			if (resp) {
+				fb.state.elements = resp;
+				fb.state.activeElements = [];
+			}
 		})
 		.catch(fb.status)
 		.finally(() => fb.files.setMod('loading', false));

package/src/modules/file-browser/fetch/load-tree.ts

@@ -9,7 +9,6 @@
  */
 
 import type { IFileBrowser } from 'jodit/types';
-import { error } from 'jodit/core/helpers/utils/error';
 import { Dom } from 'jodit/core/dom';
 import { loadItems } from 'jodit/modules/file-browser/fetch/load-items';
 
@@ -17,10 +16,6 @@ import { loadItems } from 'jodit/modules/file-browser/fetch/load-items';
  * Loads a list of directories
  */
 export async function loadTree(fb: IFileBrowser): Promise<any> {
-	const errorUni = (e: string | Error): Error => {
-		throw e instanceof Error ? e : error(e);
-	};
-
 	fb.tree.setMod('active', true);
 
 	Dom.detach(fb.tree.container);
@@ -35,15 +30,13 @@ export async function loadTree(fb: IFileBrowser): Promise<any> {
 			.then(resp => {
 				fb.state.sources = resp;
 			})
-			.catch(e => {
-				errorUni(e);
-			})
+			.catch(fb.status)
 			.finally(() => fb.tree.setMod('loading', false));
 
-		return Promise.all([tree, items]).catch(error);
+		return Promise.all([tree, items]);
 	}
 
 	fb.tree.setMod('active', false);
 
-	return items.catch(error);
+	return items;
 }

package/src/modules/file-browser/file-browser.test.js

@@ -999,7 +999,7 @@ describe('Jodit FileBrowser Tests', function () {
 						done();
 					});
 
-					simulateEvent('drop', 0, editor.editor, function (data) {
+					simulateEvent('drop', editor.editor, function (data) {
 						Object.defineProperty(data, 'dataTransfer', {
 							value: {
 								files: [

package/src/modules/file-browser/file-browser.ts

@@ -38,7 +38,8 @@ import {
 	isFunction,
 	isString,
 	ConfigProto,
-	trim
+	trim,
+	isAbort
 } from 'jodit/core/helpers';
 import { ViewWithToolbar } from 'jodit/core/view/view-with-toolbar';
 
@@ -128,6 +129,10 @@ export class FileBrowser extends ViewWithToolbar implements IFileBrowser {
 	}
 
 	private errorHandler = (resp: Error | IFileBrowserAnswer): void => {
+		if (isAbort(resp)) {
+			return;
+		}
+
 		if (resp instanceof Error) {
 			this.status(this.i18n(resp.message));
 		} else {
@@ -162,6 +167,10 @@ export class FileBrowser extends ViewWithToolbar implements IFileBrowser {
 	 */
 	@autobind
 	status(message: string | Error, success?: boolean): void {
+		if (!message || isAbort(message)) {
+			return;
+		}
+
 		if (!isString(message)) {
 			message = message.message;
 		}

package/src/modules/file-browser/listeners/self-listeners.ts

@@ -32,13 +32,13 @@ export function selfListeners(this: IFileBrowser): void {
 		.on('sort.filebrowser', (value: string) => {
 			if (value !== state.sortBy) {
 				state.sortBy = value;
-				loadItems(self).catch(self.status);
+				loadItems(self);
 			}
 		})
 		.on('filter.filebrowser', (value: string) => {
 			if (value !== state.filterWord) {
 				state.filterWord = value;
-				loadItems(self).catch(self.status);
+				loadItems(self);
 			}
 		})
 		.on('openFolder.filebrowser', (data: IDictionary): void => {
@@ -167,7 +167,7 @@ export function selfListeners(this: IFileBrowser): void {
 									self.state.activeElements = [];
 									self.status(message, true);
 
-									loadItems(self).catch(self.status);
+									loadItems(self);
 								})
 								.catch(self.status);
 
@@ -180,6 +180,6 @@ export function selfListeners(this: IFileBrowser): void {
 			}
 		)
 		.on('update.filebrowser', () => {
-			loadTree(this).then(this.status);
+			loadTree(this).then(this.status, this.status);
 		});
 }

package/src/modules/table/table.test.js

@@ -861,7 +861,7 @@ describe('Tables Jodit Editor Tests', function () {
 			editor.s.insertNode(editor.createInside.text('ok'));
 
 			expect(editor.value).equals(
-				'<table><tr><td></td><td>ok</td></tr></table>'
+				'<table style="border-collapse:collapse;width: 100%;"><tr><td></td><td>ok</td></tr></table>'
 			);
 		});
 

package/src/modules/uploader/README.md

@@ -105,6 +105,24 @@ Default success result processor. In first param it get `uploader.process` resul
 
 Default error result processor.
 
+## uploader.processFileName
+
+-   Type: `function`
+-   Default: `(key, file, name) => [key, file, name]`
+
+The method can be used to change the name of the uploaded file.
+
+```js
+Jodit.make('#editor', {
+	uploader: {
+		url: 'some-connector.php',
+		processFileName: (key, file, name) => {
+			return [key, file, 'some-prefix_' + name];
+		}
+	}
+});
+```
+
 ## Examples
 
 ### Example 1

package/src/modules/uploader/config.ts

@@ -68,6 +68,15 @@ Config.prototype.uploader = {
 			: '';
 	},
 
+	processFileName(
+		this: IUploader,
+		key: string,
+		file: File,
+		name: string
+	): [string, File, string] {
+		return [key, file, name];
+	},
+
 	process(this: IUploader, resp: IUploaderAnswer): IUploaderData {
 		return resp.data;
 	},

package/src/modules/uploader/helpers/send-files.ts

@@ -96,6 +96,7 @@ export function sendFiles(
 			file = fileList[i];
 
 			if (file) {
+				const hasRealExtension = /\.[\d\w]+$/.test(file.name);
 				const mime = file.type.match(/\/([a-z0-9]+)/i) as string[];
 
 				const extension: string =
@@ -105,7 +106,7 @@ export function sendFiles(
 					fileList[i].name ||
 					Math.random().toString().replace('.', '');
 
-				if (extension) {
+				if (!hasRealExtension && extension) {
 					let extForReg = extension;
 
 					if (['jpeg', 'jpg'].includes(extForReg)) {
@@ -119,7 +120,14 @@ export function sendFiles(
 					}
 				}
 
-				form.append(o.filesVariableName(i), fileList[i], newName);
+				const [key, iFile, name] = o.processFileName.call(
+					uploader,
+					o.filesVariableName(i),
+					fileList[i],
+					newName
+				);
+
+				form.append(key, iFile, name);
 			}
 		}
 

package/src/modules/uploader/uploader.test.js

@@ -3,6 +3,7 @@
  * Released under MIT see LICENSE.txt in the project root for license information.
  * Copyright (c) 2013-2022 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
  */
+
 describe('Test uploader module', function () {
 	describe('Drop file', function () {
 		describe('Drop Image like base64', function () {
@@ -75,6 +76,41 @@ describe('Test uploader module', function () {
 				});
 			});
 
+			describe('Change filename', () => {
+				it('Should upload file with different filename', function (done) {
+					const file = new FileImage(),
+						editor = getJodit({
+							uploader: {
+								url: 'https://xdsoft.net/jodit/connector/index.php?action=fileUpload',
+								processFileName: (key, file, name) => {
+									return [key, file, 'test_' + name];
+								}
+							},
+							events: {
+								afterInsertImage: function (img) {
+									expect(img.src).equals(
+										'https://xdsoft.net/jodit/files/test_logo.gif'
+									);
+
+									expect(sortAttributes(editor.value)).equals(
+										'<p><img src="https://xdsoft.net/jodit/files/test_logo.gif" style="width:300px"></p>'
+									);
+
+									done();
+								}
+							}
+						});
+
+					simulateEvent('drop', editor.editor, function (data) {
+						Object.defineProperty(data, 'dataTransfer', {
+							value: {
+								files: [file]
+							}
+						});
+					});
+				});
+			});
+
 			describe('For iframe mode', function () {
 				it('Should upload file and insert image with SRC from server', function (done) {
 					const timer = setTimeout(function () {