8
0
Pārlūkot izejas kodu

Merge branch 'master' into i/6091

Maciej Gołaszewski 5 gadi atpakaļ
vecāks
revīzija
d96bea1e4c

+ 1 - 1
packages/ckeditor5-image/src/imagetextalternative/ui/textalternativeformview.js

@@ -110,7 +110,7 @@ export default class TextAlternativeFormView extends View {
 			attributes: {
 				class: [
 					'ck',
-					'ck-text-alternative-form',
+					'ck-text-alternative-form'
 				],
 
 				// https://github.com/ckeditor/ckeditor5-image/issues/40

+ 1 - 1
packages/ckeditor5-image/src/imagetoolbar.js

@@ -50,7 +50,7 @@ export default class ImageToolbar extends Plugin {
 		widgetToolbarRepository.register( 'image', {
 			ariaLabel: t( 'Image toolbar' ),
 			items: editor.config.get( 'image.toolbar' ) || [],
-			getRelatedElement: getSelectedImageWidget,
+			getRelatedElement: getSelectedImageWidget
 		} );
 	}
 }

+ 21 - 21
packages/ckeditor5-image/tests/imageresize.js

@@ -172,9 +172,9 @@ describe( 'ImageResize', () => {
 	} );
 
 	describe( 'visual resizers', () => {
-		beforeEach( () => createEditor() );
+		beforeEach( async () => {
+			await createEditor();
 
-		beforeEach( () => {
 			setData( editor.model, `<paragraph>foo</paragraph>[<image src="${ IMAGE_SRC_FIXTURE }"></image>]` );
 
 			widget = viewDocument.getRoot().getChild( 1 );
@@ -214,9 +214,9 @@ describe( 'ImageResize', () => {
 	} );
 
 	describe( 'standard image resizing', () => {
-		beforeEach( () => createEditor() );
+		beforeEach( async () => {
+			await createEditor();
 
-		beforeEach( () => {
 			setData( editor.model, `<paragraph>foo</paragraph>[<image src="${ IMAGE_SRC_FIXTURE }"></image>]` );
 
 			widget = viewDocument.getRoot().getChild( 1 );
@@ -316,9 +316,9 @@ describe( 'ImageResize', () => {
 	} );
 
 	describe( 'side image resizing', () => {
-		beforeEach( () => createEditor() );
+		beforeEach( async () => {
+			await createEditor();
 
-		beforeEach( () => {
 			setData( editor.model, `<paragraph>foo</paragraph>[<image imageStyle="side" src="${ IMAGE_SRC_FIXTURE }"></image>]` );
 
 			widget = viewDocument.getRoot().getChild( 1 );
@@ -529,9 +529,9 @@ describe( 'ImageResize', () => {
 	} );
 
 	describe( 'undo integration', () => {
-		beforeEach( () => createEditor() );
+		beforeEach( async () => {
+			await createEditor();
 
-		beforeEach( () => {
 			setData( editor.model, `<paragraph>foo</paragraph>[<image src="${ IMAGE_SRC_FIXTURE }"></image>]` );
 
 			widget = viewDocument.getRoot().getChild( 1 );
@@ -560,9 +560,9 @@ describe( 'ImageResize', () => {
 	} );
 
 	describe( 'table integration', () => {
-		beforeEach( () => createEditor() );
+		beforeEach( async () => {
+			await createEditor();
 
-		beforeEach( () => {
 			setData( editor.model,
 				'<table>' +
 					`<tableRow><tableCell>[<image src="${ IMAGE_SRC_FIXTURE }"></image>]</tableCell></tableRow>` +
@@ -585,8 +585,6 @@ describe( 'ImageResize', () => {
 	} );
 
 	describe( 'srcset integration', () => {
-		beforeEach( () => createEditor() );
-
 		// The image is 96x96 pixels.
 		const imageBaseUrl = '/assets/sample.png';
 		const getModel = () => editor.model.document.getRoot().getChild( 0 );
@@ -609,7 +607,9 @@ describe( 'ImageResize', () => {
 			}
 		} );
 
-		beforeEach( () => {
+		beforeEach( async () => {
+			await createEditor();
+
 			editor.setData(
 				`<figure class="image">
 					<img src="${ imageBaseUrl }"
@@ -710,15 +710,15 @@ describe( 'ImageResize', () => {
 	describe( 'widget toolbar integration', () => {
 		let widgetToolbarRepository;
 
-		beforeEach( () => createEditor( {
-			plugins: [ Image, ImageStyle, Paragraph, Undo, Table, ImageResize, ImageToolbar, ImageTextAlternative ],
-			image: {
-				toolbar: [ 'imageTextAlternative' ],
-				resizeUnit: 'px'
-			}
-		} ) );
-
 		beforeEach( async () => {
+			await createEditor( {
+				plugins: [ Image, ImageStyle, Paragraph, Undo, Table, ImageResize, ImageToolbar, ImageTextAlternative ],
+				image: {
+					toolbar: [ 'imageTextAlternative' ],
+					resizeUnit: 'px'
+				}
+			} );
+
 			setData( editor.model, `<paragraph>foo</paragraph>[<image src="${ IMAGE_SRC_FIXTURE }"></image>]` );
 
 			widget = viewDocument.getRoot().getChild( 1 );

+ 1 - 1
packages/ckeditor5-image/tests/imagestyle/imagestyleediting.js

@@ -53,7 +53,7 @@ describe( 'ImageStyleEditing', () => {
 						styles: [
 							{ name: 'fullStyle', title: 'foo', icon: 'object-center', isDefault: true },
 							{ name: 'sideStyle', title: 'bar', icon: 'object-right', className: 'side-class' },
-							{ name: 'dummyStyle', title: 'baz', icon: 'object-dummy', className: 'dummy-class' },
+							{ name: 'dummyStyle', title: 'baz', icon: 'object-dummy', className: 'dummy-class' }
 						]
 					}
 				} )

+ 1 - 1
packages/ckeditor5-image/tests/imagetoolbar.js

@@ -61,7 +61,7 @@ describe( 'ImageToolbar', () => {
 		global.document.body.appendChild( editorElement );
 
 		return ClassicEditor.create( editorElement, {
-			plugins: [ ImageToolbar ],
+			plugins: [ ImageToolbar ]
 		} )
 			.then( editor => {
 				expect( editor.plugins.get( ImageToolbar )._toolbar ).to.be.undefined;

+ 1 - 1
packages/ckeditor5-image/tests/manual/tickets/127/1.js

@@ -20,7 +20,7 @@ import ImageToolbar from '../../../../src/imagetoolbar';
 ClassicEditor
 	.create( document.querySelector( '#editor' ), {
 		plugins: [ Enter, Typing, Paragraph, Link, Bold, Image, Undo, ImageToolbar, BalloonToolbar, ImageCaption ],
-		toolbar: [ 'bold', 'undo', 'redo' ],
+		toolbar: [ 'bold', 'undo', 'redo' ]
 	} )
 	.then( editor => {
 		window.editor = editor;