jodit 3.23.3 → 3.24.2

package/src/langs/i18n.test.js

@@ -3,82 +3,45 @@
  * 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 i18n functionality', function () {
-	describe('Helper 18n', function () {
-		const i18n = Jodit.modules.Helpers.i18n;
-
-		describe('Put defined sentence', function () {
-			it('Should replace it on defined language', function () {
-				const values = [
-					'Type something',
-					'Напишите что-либо',
-					'ru',
-
-					'rename',
-					'Переименовать',
-					'ru',
-
-					'Rename',
-					'Переименовать',
-					'ru',
-
-					'About Jodit',
-					'حول جوديت',
-					'ar',
-
-					'about Jodit',
-					'حول جوديت',
-					'ar',
-
-					'British people',
-					'British people',
-					'ar'
-				];
-
-				for (let i = 0; i < values.length; i += 3) {
-					expect(values[i + 1]).equals(
-						i18n(
-							values[i],
-							[],
-							{
-								language: values[i + 2]
-							},
-							true
-						)
-					);
-				}
-			});
+('i18n' in window.skipTest ? describe.skip : describe)(
+	'Test i18n functionality',
+	function () {
+		describe('Helper 18n', function () {
+			const i18n = Jodit.modules.Helpers.i18n;
 
-			describe('Put some information inside sentence', function () {
-				it('Should put this information inside new sentence', function () {
+			describe('Put defined sentence', function () {
+				it('Should replace it on defined language', function () {
 					const values = [
-						'Chars: %d',
-						'Символов: 1',
+						'Type something',
+						'Напишите что-либо',
 						'ru',
-						[1],
-						'Select %s',
-						'Выделить: Test',
-						'ru',
-						['Test'],
-						'select %s',
-						'Выделить: Test',
+
+						'rename',
+						'Переименовать',
 						'ru',
-						['Test'],
-						'Bla %d Bla %s',
-						'Bla 1 Bla boo',
+
+						'Rename',
+						'Переименовать',
 						'ru',
-						[1, 'boo'],
-						'Bla %d Bla %s',
-						'Bla 1 Bla boo',
-						'ru1',
-						[1, 'boo']
+
+						'About Jodit',
+						'حول جوديت',
+						'ar',
+
+						'about Jodit',
+						'حول جوديت',
+						'ar',
+
+						'British people',
+						'British people',
+						'ar'
 					];
 
-					for (let i = 0; i < values.length; i += 4) {
+					for (let i = 0; i < values.length; i += 3) {
 						expect(values[i + 1]).equals(
 							i18n(
 								values[i],
-								values[i + 3],
+								[],
 								{
 									language: values[i + 2]
 								},
@@ -87,167 +50,209 @@ describe('Test i18n functionality', function () {
 						);
 					}
 				});
-			});
-		});
 
-		const values = [
-			'Type something',
-			'Напишите что-либо',
-			'ru',
-
-			'About Jodit',
-			'حول جوديت',
-			'ar',
-
-			'About Jodit',
-			'{About Jodit}',
-			'ar1',
-
-			'British people',
-			'{British people}',
-			'ar'
-		];
-
-		for (let i = 0; i < values.length; i += 3) {
-			const [source, result, language] = [
-				values[i],
-				values[i + 1],
-				values[i + 2]
-			];
+				describe('Put some information inside sentence', function () {
+					it('Should put this information inside new sentence', function () {
+						const values = [
+							'Chars: %d',
+							'Символов: 1',
+							'ru',
+							[1],
+							'Select %s',
+							'Выделить: Test',
+							'ru',
+							['Test'],
+							'select %s',
+							'Выделить: Test',
+							'ru',
+							['Test'],
+							'Bla %d Bla %s',
+							'Bla 1 Bla boo',
+							'ru',
+							[1, 'boo'],
+							'Bla %d Bla %s',
+							'Bla 1 Bla boo',
+							'ru1',
+							[1, 'boo']
+						];
 
-			describe(`Debug mode for ${language}`, function () {
-				it(`Should show debug brackets for undefined keys for source ${source}`, function () {
-					expect(result).equals(
-						i18n(
-							source,
-							[],
-							{
-								language,
-								debugLanguage: true
-							},
-							true
-						)
-					);
+						for (let i = 0; i < values.length; i += 4) {
+							expect(values[i + 1]).equals(
+								i18n(
+									values[i],
+									values[i + 3],
+									{
+										language: values[i + 2]
+									},
+									true
+								)
+							);
+						}
+					});
 				});
 			});
-		}
-
-		describe('Define i18n property inside input options', function () {
-			it('Should use it', function () {
-				const values = [
-					'Type something',
-					'Привет',
-					'ru',
-					'About Jodit',
-					'جوديت',
-					'ar',
-					'British people',
-					'Bond',
-					'ar'
+
+			const values = [
+				'Type something',
+				'Напишите что-либо',
+				'ru',
+
+				'About Jodit',
+				'حول جوديت',
+				'ar',
+
+				'About Jodit',
+				'{About Jodit}',
+				'ar1',
+
+				'British people',
+				'{British people}',
+				'ar'
+			];
+
+			for (let i = 0; i < values.length; i += 3) {
+				const [source, result, language] = [
+					values[i],
+					values[i + 1],
+					values[i + 2]
 				];
 
-				const opt = {
-					ru: {
-						'Type something': 'Привет'
-					},
-					ar: {
-						'About Jodit': 'جوديت',
-						'British people': 'Bond'
+				describe(`Debug mode for ${language}`, function () {
+					it(`Should show debug brackets for undefined keys for source ${source}`, function () {
+						expect(result).equals(
+							i18n(
+								source,
+								[],
+								{
+									language,
+									debugLanguage: true
+								},
+								true
+							)
+						);
+					});
+				});
+			}
+
+			describe('Define i18n property inside input options', function () {
+				it('Should use it', function () {
+					const values = [
+						'Type something',
+						'Привет',
+						'ru',
+						'About Jodit',
+						'جوديت',
+						'ar',
+						'British people',
+						'Bond',
+						'ar'
+					];
+
+					const opt = {
+						ru: {
+							'Type something': 'Привет'
+						},
+						ar: {
+							'About Jodit': 'جوديت',
+							'British people': 'Bond'
+						}
+					};
+
+					for (let i = 0; i < values.length; i += 3) {
+						expect(values[i + 1]).equals(
+							i18n(
+								values[i],
+								[],
+								{
+									language: values[i + 2],
+									i18n: opt,
+									debugLanguage: true
+								},
+								true
+							)
+						);
 					}
-				};
-
-				for (let i = 0; i < values.length; i += 3) {
-					expect(values[i + 1]).equals(
-						i18n(
-							values[i],
-							[],
-							{
-								language: values[i + 2],
-								i18n: opt,
-								debugLanguage: true
-							},
-							true
-						)
-					);
-				}
+				});
 			});
 		});
-	});
-
-	describe('Test has keys in all functionality', function () {
-		const filter = [
-			'customxxx',
-			'customxxx',
-			'lineHeight',
-			'Ok',
-			'Link',
-			'Code',
-			'Embed code',
-			'Normal',
-			'Text',
-			'Split',
-			'Jodit Editor',
-			'License: %s',
-			'Split vertical',
-			'Src',
-			'Edit',
-			'Split horizontal',
-			'Styles',
-			'Classes',
-			'Alternative',
-			'Image',
-			'spellcheck',
-			'Border'
-		];
-
-		Object.keys(Jodit.lang)
-			.filter(function (language) {
-				return language !== 'en';
-			})
-			.forEach(function (language) {
-				it(
-					'Should have value for all key in ' +
-						language +
-						' language',
-					function () {
-						const editor = getJodit({
-							language: language,
-							debugLanguage: true
-						});
-
-						i18nkeys
-							.filter(function (key) {
-								return (
-									filter.indexOf(key) === -1 &&
-									!/^[0-9]+(\.[0-9]+)?(pt|px)?$/.test(key)
-								);
-							})
-							.forEach(function (key) {
-								expect('{' + key + '}').does.not.equal(
-									editor.i18n(key)
-								);
+
+		describe('Test has keys in all functionality', function () {
+			const filter = [
+				'customxxx',
+				'customxxx',
+				'lineHeight',
+				'Ok',
+				'Link',
+				'Code',
+				'Embed code',
+				'Normal',
+				'Text',
+				'Split',
+				'Jodit Editor',
+				'License: %s',
+				'Split vertical',
+				'Src',
+				'Edit',
+				'Split horizontal',
+				'Styles',
+				'Classes',
+				'Alternative',
+				'Image',
+				'spellcheck',
+				'Border'
+			];
+
+			Object.keys(Jodit.lang)
+				.filter(function (language) {
+					return language !== 'en';
+				})
+				.forEach(function (language) {
+					it(
+						'Should have value for all key in ' +
+							language +
+							' language',
+						function () {
+							const editor = getJodit({
+								language: language,
+								debugLanguage: true
 							});
+
+							i18nkeys
+								.filter(function (key) {
+									return (
+										filter.indexOf(key) === -1 &&
+										!/^[0-9]+(\.[0-9]+)?(pt|px)?$/.test(key)
+									);
+								})
+								.forEach(function (key) {
+									expect('{' + key + '}').does.not.equal(
+										editor.i18n(key)
+									);
+								});
+						}
+					);
+				});
+		});
+		describe('Test i18n function', function () {
+			it('Should show value in current language', function () {
+				const editor = getJodit({
+					language: 'ru',
+					i18n: {
+						ru: {
+							'Test %s': 'Тест %s',
+							'Test %d': 'Тест %d',
+							'Test %s %d': 'Тест %s %d'
+						}
 					}
+				});
+				expect(editor.i18n('Type something')).equals(
+					'Напишите что-либо'
+				);
+				expect(editor.i18n('Test %s', 'строка')).equals('Тест строка');
+				expect(editor.i18n('Test %s %d', 'строка', 1)).equals(
+					'Тест строка 1'
 				);
 			});
-	});
-	describe('Test i18n function', function () {
-		it('Should show value in current language', function () {
-			const editor = getJodit({
-				language: 'ru',
-				i18n: {
-					ru: {
-						'Test %s': 'Тест %s',
-						'Test %d': 'Тест %d',
-						'Test %s %d': 'Тест %s %d'
-					}
-				}
-			});
-			expect(editor.i18n('Type something')).equals('Напишите что-либо');
-			expect(editor.i18n('Test %s', 'строка')).equals('Тест строка');
-			expect(editor.i18n('Test %s %d', 'строка', 1)).equals(
-				'Тест строка 1'
-			);
 		});
-	});
-});
+	}
+);

package/src/modules/dialog/dialog.less

@@ -95,7 +95,8 @@
 	}
 
 	&_static_true {
-		position: static;
+		position: relative;
+		z-index: inherit;
 		display: block;
 		width: auto;
 		height: auto;
@@ -104,6 +105,7 @@
 
 	&_static_true &__panel {
 		position: relative;
+		z-index: inherit;
 		top: auto !important;
 		left: auto !important;
 		width: 100% !important;
@@ -323,3 +325,9 @@
 		display: none;
 	}
 }
+
+.jodit-dialog {
+	.jodit-ui-messages {
+		z-index: var(--z-index-dialog);
+	}
+}

package/src/modules/dialog/dialog.ts

@@ -45,6 +45,7 @@ import { eventEmitter, pluginSystem } from 'jodit/core/global';
 import { component, autobind, hook } from 'jodit/core/decorators';
 import { View } from 'jodit/core/view/view';
 import { Icon } from 'jodit/core/ui';
+import { UIMessages } from '../messages/messages';
 
 declare module 'jodit/config' {
 	interface Config {
@@ -66,7 +67,11 @@ Config.prototype.dialog = {
 	 */
 	draggable: true,
 	buttons: ['dialog.close'],
-	removeButtons: []
+	removeButtons: [],
+
+	toolbarButtonSize: 'middle',
+
+	zIndex: 'inherit'
 };
 
 Config.prototype.controls.dialog = {
@@ -495,6 +500,8 @@ export class Dialog extends ViewWithToolbar implements IDialog {
 	 * Sets the maximum z-index dialog box, displaying it on top of all the dialog boxes
 	 */
 	setMaxZIndex(): void {
+		if (this.getMod('static')) return;
+
 		let maxZIndex: number = 20000004,
 			zIndex: number = 0;
 
@@ -582,9 +589,12 @@ export class Dialog extends ViewWithToolbar implements IDialog {
 
 		this.destination.appendChild(this.container);
 
-		this.setPosition(this.offsetX, this.offsetY);
-
-		this.setMaxZIndex();
+		if (this.getMod('static') !== true) {
+			this.setPosition(this.offsetX, this.offsetY);
+			this.setMaxZIndex();
+		} else {
+			this.container.style.removeProperty('z-index');
+		}
 
 		if (this.o.fullsize) {
 			this.toggleFullSize(true);
@@ -677,20 +687,14 @@ export class Dialog extends ViewWithToolbar implements IDialog {
 		return this;
 	}
 
-	constructor(options?: Partial<IDialogOptions>) {
+	constructor(options: Partial<IDialogOptions> = {}) {
 		super(options);
 
 		const self: Dialog = this;
 
 		self.options = ConfigProto(
-			options ?? {},
-
-			ConfigProto(
-				{
-					toolbarButtonSize: 'middle'
-				},
-				ConfigProto(Config.prototype.dialog, View.defaultOptions)
-			)
+			options,
+			ConfigProto(Config.prototype.dialog, View.defaultOptions)
 		) as IDialogOptions;
 
 		Dom.safeRemove(self.container);
@@ -698,9 +702,7 @@ export class Dialog extends ViewWithToolbar implements IDialog {
 		const n = this.getFullElName.bind(this);
 
 		self.container = this.c.fromHTML(
-			`<div style="z-index:${self.o.zIndex}" class="jodit jodit-dialog ${
-				this.componentName
-			}">
+			`<div class="jodit jodit-dialog ${this.componentName}">
 				<div class="${n('overlay')}"></div>
 				<div class="${this.getFullElName('panel')}">
 					<div class="${n('header')}">
@@ -714,6 +716,10 @@ export class Dialog extends ViewWithToolbar implements IDialog {
 			</div>`
 		) as HTMLDivElement;
 
+		if (this.o.zIndex) {
+			this.container.style.zIndex = this.o.zIndex.toString();
+		}
+
 		attr(self.container, 'role', 'dialog');
 
 		Object.defineProperty(self.container, 'component', {
@@ -746,6 +752,9 @@ export class Dialog extends ViewWithToolbar implements IDialog {
 			'header-toolbar element does not exist'
 		);
 
+		this.message.destruct();
+		this.message = new UIMessages(this, dialog);
+
 		this.dialog = dialog;
 		this.resizer = resizer;
 		this.dialogbox_header = dialogbox_header;

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

@@ -190,14 +190,12 @@ export default class DataProvider implements IFileBrowserDataProvider {
 		);
 	}
 
-	/**
-	 * Load items list by path and source
-	 */
-	items(
+	private __items<Result>(
 		path: string,
 		source: string,
-		mods: IFileBrowserDataProviderItemsMods = {}
-	): Promise<IFileBrowserItem[]> {
+		mods: IFileBrowserDataProviderItemsMods,
+		onResult: (resp: IFileBrowserAnswer) => Result
+	): Promise<Result> {
 		const opt = this.options;
 
 		if (!opt.items) {
@@ -220,10 +218,40 @@ export default class DataProvider implements IFileBrowserDataProvider {
 				resp = process.call(self, resp);
 			}
 
-			return this.generateItemsList(resp.data.sources, mods);
+			return onResult(resp);
 		});
 	}
 
+	/**
+	 * Load items list by path and source
+	 */
+	items(
+		path: string,
+		source: string,
+		mods: IFileBrowserDataProviderItemsMods = {}
+	): Promise<IFileBrowserItem[]> {
+		return this.__items(path, source, mods, resp =>
+			this.generateItemsList(resp.data.sources, mods)
+		);
+	}
+
+	/**
+	 * Load items list by path and source
+	 */
+	itemsEx(
+		path: string,
+		source: string,
+		mods: IFileBrowserDataProviderItemsMods = {}
+	): ReturnType<IFileBrowserDataProvider['itemsEx']> {
+		const calcTotal = (sources: ISourcesFiles): number =>
+			sources.reduce((acc, source) => acc + source.files.length, 0);
+
+		return this.__items(path, source, mods, resp => ({
+			items: this.generateItemsList(resp.data.sources, mods),
+			loadedTotal: calcTotal(resp.data.sources)
+		}));
+	}
+
 	private generateItemsList(
 		sources: ISourcesFiles,
 		mods: IFileBrowserDataProviderItemsMods = {}
@@ -231,11 +259,15 @@ export default class DataProvider implements IFileBrowserDataProvider {
 		const elements: IFileBrowserItem[] = [];
 
 		const canBeFile = (item: ISourceFile): boolean =>
-				!mods.onlyImages || item.isImage === undefined || item.isImage,
-			inFilter = (item: ISourceFile): boolean =>
-				!mods.filterWord?.length ||
-				this.o.filter === undefined ||
-				this.o.filter(item, mods.filterWord);
+			item.type === 'folder' ||
+			!mods.onlyImages ||
+			item.isImage === undefined ||
+			item.isImage;
+
+		const inFilter = (item: ISourceFile): boolean =>
+			!mods.filterWord?.length ||
+			this.o.filter === undefined ||
+			this.o.filter(item, mods.filterWord);
 
 		sources.forEach(source => {
 			if (source.files && source.files.length) {