jodit 3.23.3 → 3.24.2

package/src/plugins/font/config.ts

@@ -114,13 +114,13 @@ Config.prototype.controls.font = {
 
 	list: {
 		'': 'Default',
-		'Helvetica,sans-serif': 'Helvetica',
-		'Arial,Helvetica,sans-serif': 'Arial',
-		'Georgia,serif': 'Georgia',
-		'Impact,Charcoal,sans-serif': 'Impact',
-		'Tahoma,Geneva,sans-serif': 'Tahoma',
-		'Times New Roman,Times,serif': 'Times New Roman',
-		'Verdana,Geneva,sans-serif': 'Verdana'
+		'helvetica,sans-serif': 'Helvetica',
+		'arial,helvetica,sans-serif': 'Arial',
+		'georgia,palatino,serif': 'Georgia',
+		'impact,charcoal,sans-serif': 'Impact',
+		'tahoma,geneva,sans-serif': 'Tahoma',
+		'times new roman,times,serif': 'Times New Roman',
+		'verdana,geneva,sans-serif': 'Verdana'
 	},
 
 	childTemplate: (editor, key: string, value: string) => {
@@ -132,7 +132,7 @@ Config.prototype.controls.font = {
 				document.fonts.check(`16px ${key}`, value);
 		} catch {}
 
-		return `<span style="${
+		return `<span data-style="${key}" style="${
 			isAvailable ? `font-family: ${key}!important;` : ''
 		}">${value}</span>`;
 	},

package/src/plugins/font/font.test.js

@@ -27,18 +27,19 @@ describe('Font test', function () {
 				simulateEvent('mousedown', editor.editor);
 
 				Array.from(openFontNameList()).map(function (font) {
-					simulateEvent('click', 0, font);
+					simulateEvent('click', font);
 
 					const fontFamily = font
 						.querySelector('span[style]')
-						.getAttribute('style')
+						.getAttribute('data-style')
 						.replace(/"/g, "'");
 
 					expect(sortAttributes(editor.value)).equals(
 						sortAttributes(
-							'<p><span style="' +
-								fontFamily.replace('!important', '') +
-								'">test</span></p>'
+							`<p><span style="font-family:${fontFamily.replace(
+								'!important',
+								''
+							)}">test</span></p>`
 						)
 					);
 				});
@@ -99,12 +100,12 @@ describe('Font test', function () {
 			clickTrigger('font', editor);
 			const list2 = getOpenedPopup(editor);
 
-			clickButton('Impact_Charcoal_sans_serif', list2);
+			clickButton('impact_charcoal_sans_serif', list2);
 			editor.s.insertHTML('stop');
 
 			expect(sortAttributes(editor.value)).equals(
 				'<p><span style="font-size:10px">test' +
-					'<span style="font-family:Impact,Charcoal,sans-serif">stop</span></span></p>'
+					'<span style="font-family:impact,charcoal,sans-serif">stop</span></span></p>'
 			);
 		});
 	});
@@ -153,9 +154,7 @@ describe('Font test', function () {
 							clickButton('8', popup);
 
 							expect(sortAttributes(editor.value)).equals(
-								'<p>tex<span style="font-size:8' +
-									point +
-									'">t2t</span>ext</p>'
+								`<p>tex<span style="font-size:8${point}">t2t</span>ext</p>`
 							);
 
 							const range2 = editor.s.createRange(true);
@@ -169,11 +168,7 @@ describe('Font test', function () {
 							expect(popup2).is.null;
 
 							expect(editor.value).equals(
-								'<p>tex<span style="font-size: 8' +
-									point +
-									';">t2t</span>ext</p><p><span style="font-size: 8' +
-									point +
-									';"></span></p>'
+								`<p>tex<span style="font-size: 8${point};">t2t</span>ext</p><p><span style="font-size: 8${point};"></span></p>`
 							);
 						});
 					});
@@ -212,10 +207,10 @@ describe('Font test', function () {
 
 						expect(popup).is.not.null;
 
-						clickButton('Impact_Charcoal_sans_serif', popup);
+						clickButton('impact_charcoal_sans_serif', popup);
 
 						expect(editor.value).equals(
-							'<p>tex<span style="font-family: Impact, Charcoal, sans-serif;">t2t</span>ext</p>'
+							'<p>tex<span style="font-family: impact, charcoal, sans-serif;">t2t</span>ext</p>'
 						);
 
 						const range2 = editor.s.createRange(true);
@@ -229,7 +224,7 @@ describe('Font test', function () {
 						expect(popup2).is.null;
 
 						expect(editor.value).equals(
-							'<p>tex<span style="font-family: Impact, Charcoal, sans-serif;">t2t</span>ext</p><p><span style="font-family: Impact, Charcoal, sans-serif;"></span></p>'
+							'<p>tex<span style="font-family: impact, charcoal, sans-serif;">t2t</span>ext</p><p><span style="font-family: impact, charcoal, sans-serif;"></span></p>'
 						);
 					});
 				});
@@ -257,13 +252,13 @@ describe('Font test', function () {
 					expect(font).is.not.null;
 
 					editor.s.setCursorAfter(p.firstChild);
-					simulateEvent('mousedown', 0, p);
+					simulateEvent('mousedown', p);
 
 					expect(font.getAttribute('aria-pressed')).equals('false');
 
 					editor.s.setCursorIn(p.lastChild);
 
-					simulateEvent('mousedown', 0, p);
+					simulateEvent('mousedown', p);
 
 					clickTrigger('fontsize', editor);
 
@@ -285,7 +280,7 @@ describe('Font test', function () {
 					});
 
 					editor.value =
-						'<p>test<span style="font-family: Georgia, serif;">bold</span></p>';
+						'<p>test<span style="font-family: georgia,palatino,serif;">bold</span></p>';
 					editor.s.focus();
 
 					const p = editor.editor.firstChild;
@@ -294,7 +289,7 @@ describe('Font test', function () {
 					expect(font).is.not.null;
 
 					editor.s.setCursorAfter(p.firstChild);
-					simulateEvent('mousedown', 0, p);
+					simulateEvent('mousedown', p);
 					expect(font.getAttribute('aria-pressed')).equals('false');
 
 					editor.s.setCursorIn(p.lastChild);
@@ -306,7 +301,7 @@ describe('Font test', function () {
 					const popup = getOpenedPopup(editor);
 
 					const fontGeorgia = popup.querySelector(
-						'[class*=Georgia_serif]'
+						'[class*=georgia_palatino]'
 					);
 
 					expect(fontGeorgia).does.not.equal(font);

package/src/plugins/hotkeys/hotkeys.test.js

@@ -7,19 +7,15 @@
 describe('Hotkeys', function () {
 	describe('Override default shortcuts for some commands', function () {
 		it('Should work default shortcuts for another commands', function () {
-			const area = appendTestArea(),
-				editor = new Jodit(area, {
-					commandToHotkeys: {
-						bold: 'ctrl+shift+b',
-						italic: ['ctrl+i', 'ctrl+shift+i']
-					}
-				});
-
-			editor.value = 'test test test';
+			const editor = getJodit({
+				commandToHotkeys: {
+					bold: 'ctrl+shift+b',
+					italic: ['ctrl+i', 'ctrl+shift+i']
+				}
+			});
 
-			const range = editor.s.createRange(true);
-			range.setStart(editor.editor.firstChild.firstChild, 4);
-			range.setEnd(editor.editor.firstChild.firstChild, 8);
+			editor.value = '<p>test| tes|t test</p>';
+			setCursorToChar(editor);
 
 			// standart ctrl+u
 			simulateEvent('keydown', 85, editor.editor, function (data) {
@@ -29,21 +25,18 @@ describe('Hotkeys', function () {
 
 			expect(editor.value).equals('<p>test<u> tes</u>t test</p>');
 		});
-		describe('Replace ctrl+b to ctrl+shift+b for bold command', function () {
-			it('Should not execute bold on ctrl+b', function () {
-				const area = appendTestArea(),
-					editor = new Jodit(area, {
-						commandToHotkeys: {
-							bold: 'ctrl+shift+b',
-							italic: ['ctrl+i', 'ctrl+shift+i']
-						}
-					});
 
-				editor.value = 'test test test';
+		describe('Replace ctrl+b to ctrl+alt+b for bold command', function () {
+			it('Should not execute bold on ctrl+b', function () {
+				const editor = getJodit({
+					commandToHotkeys: {
+						bold: 'ctrl+alt+b',
+						italic: ['ctrl+i', 'ctrl+shift+i']
+					}
+				});
 
-				const range = editor.s.createRange(true);
-				range.setStart(editor.editor.firstChild.firstChild, 4);
-				range.setEnd(editor.editor.firstChild.firstChild, 8);
+				editor.value = '<p>test| tes|t test</p>';
+				setCursorToChar(editor);
 
 				// standart ctrl+b
 				simulateEvent('keydown', 66, editor.editor, function (data) {
@@ -54,7 +47,7 @@ describe('Hotkeys', function () {
 				expect(editor.value).equals('<p>test test test</p>'); // should not sork
 
 				simulateEvent('keydown', 66, editor.editor, function (data) {
-					data.shiftKey = true;
+					data.altKey = true;
 					data.ctrlKey = true;
 				});
 
@@ -63,23 +56,19 @@ describe('Hotkeys', function () {
 				);
 			});
 
-			it('Should execute bold on ctrl+shift+b', function () {
-				const area = appendTestArea(),
-					editor = new Jodit(area, {
-						commandToHotkeys: {
-							bold: 'ctrl+shift+b',
-							italic: ['ctrl+i', 'ctrl+shift+i']
-						}
-					});
-
-				editor.value = 'test test test';
+			it('Should execute bold on ctrl+alt+b', function () {
+				const editor = getJodit({
+					commandToHotkeys: {
+						bold: 'ctrl+alt+b',
+						italic: ['ctrl+i', 'ctrl+shift+i']
+					}
+				});
 
-				const range = editor.s.createRange(true);
-				range.setStart(editor.editor.firstChild.firstChild, 4);
-				range.setEnd(editor.editor.firstChild.firstChild, 8);
+				editor.value = '<p>test| tes|t test</p>';
+				setCursorToChar(editor);
 
 				simulateEvent('keydown', 66, editor.editor, function (data) {
-					data.shiftKey = true;
+					data.altKey = true;
 					data.ctrlKey = true;
 				});
 
@@ -106,13 +95,12 @@ describe('Hotkeys', function () {
 
 		describe('Add ctrl+shift+i to default ctrl+i shortcut for italic command', function () {
 			it('Should work with each of shortcuts', function () {
-				const area = appendTestArea(),
-					editor = new Jodit(area, {
-						commandToHotkeys: {
-							bold: 'ctrl+shift+b',
-							italic: ['ctrl+i', 'ctrl+shift+i']
-						}
-					});
+				const editor = getJodit({
+					commandToHotkeys: {
+						bold: 'ctrl+shift+b',
+						italic: ['ctrl+i', 'ctrl+shift+i']
+					}
+				});
 
 				editor.value = '<p>test| tes|t test</p>';
 				setCursorToChar(editor);