Merge pull request #9896 from ckeditor/ck/9545-renaming-full-style

Other (image): The default image style is now called `block`, instead of `full`. Its label reads now "Centered image" and it is represented by the appropriate icon in the image toolbar. See #9545.
ckeditor · Jun 21, 2021 · b5908e5 · b5908e5
2 parents 67b4c7d + f989da1
commit b5908e5
Show file tree

Hide file tree

Showing 95 changed files with 152 additions and 146 deletions.
diff --git a/docs/_snippets/examples/multi-root-editor.js b/docs/_snippets/examples/multi-root-editor.js
@@ -398,7 +398,7 @@ MultirootEditor
 			'insertTable', 'mediaEmbed', 'undo', 'redo' ],
 		image: {
 			toolbar: [
-				'imageStyle:inline', 'imageStyle:full', 'imageStyle:side', '|', 'toggleImageCaption', 'imageTextAlternative'
+				'imageStyle:inline', 'imageStyle:block', 'imageStyle:side', '|', 'toggleImageCaption', 'imageTextAlternative'
 			]
 		},
 		table: {

diff --git a/docs/_snippets/features/toolbar-breakpoint.js b/docs/_snippets/features/toolbar-breakpoint.js
@@ -27,7 +27,7 @@ ClassicEditor
 			viewportTopOffset: window.getViewportTopOffsetConfig()
 		},
 		image: {
-			toolbar: [ 'imageStyle:inline', 'imageStyle:full', 'imageStyle:side', '|', 'toggleImageCaption', 'imageTextAlternative' ]
+			toolbar: [ 'imageStyle:inline', 'imageStyle:block', 'imageStyle:side', '|', 'toggleImageCaption', 'imageTextAlternative' ]
 		},
 		codeBlock: {
 			languages: [

diff --git a/docs/_snippets/features/toolbar-grouping.js b/docs/_snippets/features/toolbar-grouping.js
@@ -23,7 +23,7 @@ ClassicEditor
 			viewportTopOffset: window.getViewportTopOffsetConfig()
 		},
 		image: {
-			toolbar: [ 'imageStyle:inline', 'imageStyle:full', 'imageStyle:side', '|', 'toggleImageCaption', 'imageTextAlternative' ]
+			toolbar: [ 'imageStyle:inline', 'imageStyle:block', 'imageStyle:side', '|', 'toggleImageCaption', 'imageTextAlternative' ]
 		},
 		codeBlock: {
 			languages: [

diff --git a/docs/_snippets/features/toolbar-wrapping.js b/docs/_snippets/features/toolbar-wrapping.js
@@ -28,7 +28,7 @@ ClassicEditor
 			viewportTopOffset: window.getViewportTopOffsetConfig()
 		},
 		image: {
-			toolbar: [ 'imageStyle:inline', 'imageStyle:full', 'imageStyle:side', '|', 'toggleImageCaption', 'imageTextAlternative' ]
+			toolbar: [ 'imageStyle:inline', 'imageStyle:block', 'imageStyle:side', '|', 'toggleImageCaption', 'imageTextAlternative' ]
 		},
 		codeBlock: {
 			languages: [

diff --git a/docs/builds/guides/development/dll-builds.md b/docs/builds/guides/development/dll-builds.md
@@ -126,7 +126,7 @@ For example:
 		image: {
 			toolbar: [
 				'imageStyle:inline',
-				'imageStyle:full',
+				'imageStyle:block',
 				'imageStyle:side',
 				'|',
 				'toggleImageCaption',

diff --git a/docs/builds/guides/integration/advanced-setup.md b/docs/builds/guides/integration/advanced-setup.md
@@ -266,7 +266,7 @@ ClassicEditor.defaultConfig = {
 	image: {
 		toolbar: [
 			'imageStyle:inline',
-			'imageStyle:full',
+			'imageStyle:block',
 			'imageStyle:side',
 			'|',
 			'toggleImageCaption',
@@ -354,7 +354,7 @@ ClassicEditor
 		image: {
 			toolbar: [
 				'imageStyle:inline',
-				'imageStyle:full',
+				'imageStyle:block',
 				'imageStyle:side',
 				'|',
 				'toggleImageCaption',

diff --git a/docs/builds/guides/integration/installing-plugins.md b/docs/builds/guides/integration/installing-plugins.md
@@ -115,7 +115,7 @@ ClassicEditor.defaultConfig = {
 	image: {
 		toolbar: [
 			'imageStyle:inline',
-			'imageStyle:full',
+			'imageStyle:block',
 			'imageStyle:side',
 			'|',
 			'toggleImageCaption',

diff --git a/docs/builds/guides/migration/migration-to-29.md b/docs/builds/guides/migration/migration-to-29.md
@@ -43,6 +43,8 @@ Since the appearance of the image in the document depends on the image type (blo
 	* A few {@link module:image/imagestyle/utils#DEFAULT_DROPDOWN_DEFINITIONS default drop-downs} are provided.
 	* In the editor configuration {@link module:image/imagestyle/imagestyleui~ImageStyleDropdownDefinition a custom drop-down} can be declared.
 
+* The name of the default block image style has changed from `full` to `block` (as the default style for the inline images is called `inline`), the default {@link builds/guides/integration/content-styles content styles} for these kind of images remains the same. The button label has also changed and now reads `Centered image`, so that it reflects the actual appearance of the image. If you customized the default appearance of the block images, you can change the button label by {@link module:image/image~ImageConfig#styles modifying an existing image style}.
+
 * The format of the `config.image.styles` has changed. The list of the styles must be wrapped with the `options` array. Read more about the {@link module:image/image~ImageConfig#styles `image.styles` configuration}.
 
 ```js
@@ -59,7 +61,7 @@ Editor.create( document.querySelector( '#editor' ), {
 	...
 	image: {
 		styles: {
-			options: [ 'inline', 'full', 'side' ]
+			options: [ 'inline', 'block', 'side' ]
 		}
 	}
 } );
@@ -117,7 +119,7 @@ Due to the changes mentioned above, the {@link module:image/image~ImageConfig#to
 		image: {
 			toolbar: [
 				'imageStyle:inline',
-				'imageStyle:full',
+				'imageStyle:block',
 				'imageStyle:side',
 				'|',
 				'toggleImageCaption',
@@ -138,7 +140,7 @@ Due to the changes mentioned above, the {@link module:image/image~ImageConfig#to
 				'imageStyle:inline',
 				// A drop-down containing `alignLeft` and `alignRight` options
 				'imageStyle:wrapText',
-				// A drop-down containing `alignBlockLeft`, `full` (default) and  `alignBlockRight` options
+				// A drop-down containing `alignBlockLeft`, `block` (default) and  `alignBlockRight` options
 				'imageStyle:breakText'
 			]
 		}

diff --git a/packages/ckeditor5-autosave/src/autosave.js b/packages/ckeditor5-autosave/src/autosave.js
@@ -26,7 +26,7 @@ import { debounce } from 'lodash-es';
  *				plugins: [ ArticlePluginSet, Autosave ],
  *				toolbar: [ 'heading', '|', 'bold', 'italic', 'link', 'bulletedList', 'numberedList', 'blockQuote', 'undo', 'redo' ],
  *				image: {
- *					toolbar: [ 'imageStyle:full', 'imageStyle:side', '|', 'toggleImageCaption', 'imageTextAlternative' ],
+ *					toolbar: [ 'imageStyle:block', 'imageStyle:side', '|', 'toggleImageCaption', 'imageTextAlternative' ],
  *				},
  *				autosave: {
  *					save( editor ) {

diff --git a/packages/ckeditor5-autosave/tests/manual/autosave.js b/packages/ckeditor5-autosave/tests/manual/autosave.js
@@ -15,7 +15,7 @@ ClassicEditor
 		plugins: [ ArticlePluginSet, Autosave ],
 		toolbar: [ 'heading', '|', 'bold', 'italic', 'link', 'bulletedList', 'numberedList', 'blockQuote', 'undo', 'redo' ],
 		image: {
-			toolbar: [ 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
+			toolbar: [ 'imageStyle:block', 'imageStyle:side', '|', 'imageTextAlternative' ]
 		}
 	} )
 	.then( editor => {

diff --git a/packages/ckeditor5-build-balloon-block/src/ckeditor.js b/packages/ckeditor5-build-balloon-block/src/ckeditor.js
@@ -94,7 +94,7 @@ BalloonEditor.defaultConfig = {
 	image: {
 		toolbar: [
 			'imageStyle:inline',
-			'imageStyle:full',
+			'imageStyle:block',
 			'imageStyle:side',
 			'|',
 			'toggleImageCaption',

diff --git a/packages/ckeditor5-build-balloon/src/ckeditor.js b/packages/ckeditor5-build-balloon/src/ckeditor.js
@@ -87,7 +87,7 @@ BalloonEditor.defaultConfig = {
 	image: {
 		toolbar: [
 			'imageStyle:inline',
-			'imageStyle:full',
+			'imageStyle:block',
 			'imageStyle:side',
 			'|',
 			'toggleImageCaption',

diff --git a/packages/ckeditor5-build-classic/src/ckeditor.js b/packages/ckeditor5-build-classic/src/ckeditor.js
@@ -87,7 +87,7 @@ ClassicEditor.defaultConfig = {
 	image: {
 		toolbar: [
 			'imageStyle:inline',
-			'imageStyle:full',
+			'imageStyle:block',
 			'imageStyle:side',
 			'|',
 			'toggleImageCaption',

diff --git a/packages/ckeditor5-build-inline/src/ckeditor.js b/packages/ckeditor5-build-inline/src/ckeditor.js
@@ -87,7 +87,7 @@ InlineEditor.defaultConfig = {
 	image: {
 		toolbar: [
 			'imageStyle:inline',
-			'imageStyle:full',
+			'imageStyle:block',
 			'imageStyle:side',
 			'|',
 			'toggleImageCaption',

diff --git a/packages/ckeditor5-ckfinder/tests/manual/ckfinder.js b/packages/ckeditor5-ckfinder/tests/manual/ckfinder.js
@@ -17,7 +17,7 @@ ClassicEditor
 		plugins: [ ArticlePluginSet, ImageUpload, CKFinderUploadAdapter, CKFinder ],
 		toolbar: [ 'heading', '|', 'undo', 'redo', 'ckfinder' ],
 		image: {
-			toolbar: [ 'imageStyle:inline', 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
+			toolbar: [ 'imageStyle:inline', 'imageStyle:block', 'imageStyle:side', '|', 'imageTextAlternative' ]
 		},
 		ckfinder: {
 			// eslint-disable-next-line max-len

diff --git a/packages/ckeditor5-core/src/editor/editor.js b/packages/ckeditor5-core/src/editor/editor.js
@@ -70,7 +70,7 @@ export default class Editor {
 		 * Stores all configurations specific to this editor instance.
 		 *
 		 *		editor.config.get( 'image.toolbar' );
-		 *		// -> [ 'imageStyle:full', 'imageStyle:side', '|', 'toggleImageCaption', 'imageTextAlternative' ]
+		 *		// -> [ 'imageStyle:block', 'imageStyle:side', '|', 'toggleImageCaption', 'imageTextAlternative' ]
 		 *
 		 * @readonly
 		 * @member {module:utils/config~Config}

diff --git a/packages/ckeditor5-core/tests/_utils-tests/articlepluginset.js b/packages/ckeditor5-core/tests/_utils-tests/articlepluginset.js
@@ -36,7 +36,7 @@ describe( 'ArticlePluginSet', () => {
 		editor = await ClassicTestEditor.create( editorElement, {
 			plugins: [ ArticlePluginSet ],
 			image: {
-				toolbar: [ 'imageStyle:full', 'imageStyle:side' ]
+				toolbar: [ 'imageStyle:block', 'imageStyle:side' ]
 			}
 		} );
 	} );

diff --git a/packages/ckeditor5-core/tests/manual/pendingactions.js b/packages/ckeditor5-core/tests/manual/pendingactions.js
@@ -15,7 +15,7 @@ ClassicEditor
 		plugins: [ ArticlePluginSet, PendingActions ],
 		toolbar: [ 'heading', '|', 'bold', 'italic', 'link', 'bulletedList', 'numberedList', 'blockQuote', 'undo', 'redo' ],
 		image: {
-			toolbar: [ 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
+			toolbar: [ 'imageStyle:block', 'imageStyle:side', '|', 'imageTextAlternative' ]
 		}
 	} )
 	.then( editor => {

diff --git a/packages/ckeditor5-core/tests/manual/readonly.js b/packages/ckeditor5-core/tests/manual/readonly.js
@@ -15,7 +15,7 @@ ClassicEditor
 		plugins: [ ArticlePluginSet, BalloonToolbar ],
 		toolbar: [ 'heading', '|', 'bold', 'italic', 'link', 'bulletedList', 'numberedList', 'blockQuote', 'undo', 'redo' ],
 		image: {
-			toolbar: [ 'imageStyle:inline', 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
+			toolbar: [ 'imageStyle:inline', 'imageStyle:block', 'imageStyle:side', '|', 'imageTextAlternative' ]
 		},
 		balloonToolbar: [ 'bold', 'italic', 'link' ]
 	} )

diff --git a/packages/ckeditor5-core/tests/manual/version-collision.js b/packages/ckeditor5-core/tests/manual/version-collision.js
@@ -13,7 +13,7 @@ ClassicEditor
 		plugins: [ ArticlePluginSet ],
 		toolbar: [ 'heading', '|', 'bold', 'italic', 'link', 'bulletedList', 'numberedList', 'blockQuote', 'undo', 'redo' ],
 		image: {
-			toolbar: [ 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
+			toolbar: [ 'imageStyle:block', 'imageStyle:side', '|', 'imageTextAlternative' ]
 		}
 	} )
 	.then( editor => {

diff --git a/packages/ckeditor5-easy-image/tests/manual/easyimage.js b/packages/ckeditor5-easy-image/tests/manual/easyimage.js
@@ -33,7 +33,7 @@ ClassicEditor
 			'redo'
 		],
 		image: {
-			toolbar: [ 'imageStyle:inline', 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
+			toolbar: [ 'imageStyle:inline', 'imageStyle:block', 'imageStyle:side', '|', 'imageTextAlternative' ]
 		},
 		table: {
 			contentToolbar: [

diff --git a/packages/ckeditor5-editor-balloon/tests/ballooneditor.js b/packages/ckeditor5-editor-balloon/tests/ballooneditor.js
@@ -373,7 +373,7 @@ describe( 'BalloonEditor', () => {
 					plugins: [ ArticlePluginSet ],
 					toolbar: [ 'heading', '|', 'bold', 'italic', 'link', 'bulletedList', 'numberedList', 'blockQuote' ],
 					image: {
-						toolbar: [ 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
+						toolbar: [ 'imageStyle:block', 'imageStyle:side', '|', 'imageTextAlternative' ]
 					}
 				} ) );
 	} );

diff --git a/packages/ckeditor5-editor-balloon/tests/manual/ballooneditor.js b/packages/ckeditor5-editor-balloon/tests/manual/ballooneditor.js
@@ -23,7 +23,7 @@ function initEditors() {
 				plugins: [ ArticlePluginSet ],
 				toolbar: [ 'heading', '|', 'bold', 'italic', 'link', 'bulletedList', 'numberedList', 'blockQuote' ],
 				image: {
-					toolbar: [ 'imageStyle:inline', 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
+					toolbar: [ 'imageStyle:inline', 'imageStyle:block', 'imageStyle:side', '|', 'imageTextAlternative' ]
 				}
 			} )
 			.then( editor => {

diff --git a/packages/ckeditor5-editor-balloon/tests/manual/memory.js b/packages/ckeditor5-editor-balloon/tests/manual/memory.js
@@ -45,7 +45,7 @@ function initEditors() {
 				image: {
 					toolbar: [
 						'imageStyle:inline',
-						'imageStyle:full',
+						'imageStyle:block',
 						'imageStyle:side',
 						'|',
 						'imageTextAlternative'

diff --git a/packages/ckeditor5-editor-classic/tests/classiceditor.js b/packages/ckeditor5-editor-classic/tests/classiceditor.js
@@ -360,7 +360,7 @@ describe( 'ClassicEditor', () => {
 					plugins: [ ArticlePluginSet ],
 					toolbar: [ 'heading', '|', 'bold', 'italic', 'link', 'bulletedList', 'numberedList', 'blockQuote' ],
 					image: {
-						toolbar: [ 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
+						toolbar: [ 'imageStyle:block', 'imageStyle:side', '|', 'imageTextAlternative' ]
 					}
 				} ) );
 	} );

diff --git a/packages/ckeditor5-editor-classic/tests/manual/memory.js b/packages/ckeditor5-editor-classic/tests/manual/memory.js
@@ -39,7 +39,7 @@ function initEditor() {
 			image: {
 				toolbar: [
 					'imageStyle:inline',
-					'imageStyle:full',
+					'imageStyle:block',
 					'imageStyle:side',
 					'|',
 					'imageTextAlternative'

diff --git a/packages/ckeditor5-editor-decoupled/tests/decouplededitor.js b/packages/ckeditor5-editor-decoupled/tests/decouplededitor.js
@@ -414,7 +414,7 @@ describe( 'DecoupledEditor', () => {
 					plugins: [ ArticlePluginSet ],
 					toolbar: [ 'heading', '|', 'bold', 'italic', 'link', 'bulletedList', 'numberedList', 'blockQuote' ],
 					image: {
-						toolbar: [ 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
+						toolbar: [ 'imageStyle:block', 'imageStyle:side', '|', 'imageTextAlternative' ]
 					}
 				} ) );
 	} );

diff --git a/packages/ckeditor5-editor-decoupled/tests/manual/memory.js b/packages/ckeditor5-editor-decoupled/tests/manual/memory.js
@@ -41,7 +41,7 @@ function initEditor() {
 			image: {
 				toolbar: [
 					'imageStyle:inline',
-					'imageStyle:full',
+					'imageStyle:block',
 					'imageStyle:side',
 					'|',
 					'imageTextAlternative'

diff --git a/packages/ckeditor5-editor-inline/tests/inlineeditor.js b/packages/ckeditor5-editor-inline/tests/inlineeditor.js
@@ -383,7 +383,7 @@ describe( 'InlineEditor', () => {
 					plugins: [ ArticlePluginSet ],
 					toolbar: [ 'heading', '|', 'bold', 'italic', 'link', 'bulletedList', 'numberedList', 'blockQuote' ],
 					image: {
-						toolbar: [ 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
+						toolbar: [ 'imageStyle:block', 'imageStyle:side', '|', 'imageTextAlternative' ]
 					}
 				} ) );
 	} );

diff --git a/packages/ckeditor5-editor-inline/tests/manual/memory.js b/packages/ckeditor5-editor-inline/tests/manual/memory.js
@@ -45,7 +45,7 @@ function initEditors() {
 				image: {
 					toolbar: [
 						'imageStyle:inline',
-						'imageStyle:full',
+						'imageStyle:block',
 						'imageStyle:side',
 						'|',
 						'imageTextAlternative'

diff --git a/packages/ckeditor5-engine/docs/_snippets/framework/element-reconversion-demo.js b/packages/ckeditor5-engine/docs/_snippets/framework/element-reconversion-demo.js
@@ -333,7 +333,7 @@ ClassicEditor
 		cloudServices: CS_CONFIG,
 		extraPlugins: [ ComplexBox ],
 		image: {
-			toolbar: [ 'imageStyle:inline', 'imageStyle:full', 'imageStyle:side', '|', 'toggleImageCaption', 'imageTextAlternative' ]
+			toolbar: [ 'imageStyle:inline', 'imageStyle:block', 'imageStyle:side', '|', 'toggleImageCaption', 'imageTextAlternative' ]
 		},
 		table: {
 			contentToolbar: [

diff --git a/...s/ckeditor5-engine/docs/_snippets/framework/extending-content-custom-element-converter.js b/...s/ckeditor5-engine/docs/_snippets/framework/extending-content-custom-element-converter.js
@@ -185,7 +185,7 @@ ClassicEditor
 		cloudServices: CS_CONFIG,
 		extraPlugins: [ InfoBox ],
 		image: {
-			toolbar: [ 'imageStyle:inline', 'imageStyle:full', 'imageStyle:side', '|', 'toggleImageCaption', 'imageTextAlternative' ]
+			toolbar: [ 'imageStyle:inline', 'imageStyle:block', 'imageStyle:side', '|', 'toggleImageCaption', 'imageTextAlternative' ]
 		},
 		table: {
 			contentToolbar: [

diff --git a/packages/ckeditor5-engine/tests/manual/slotconversion.js b/packages/ckeditor5-engine/tests/manual/slotconversion.js
@@ -274,7 +274,7 @@ ClassicEditor
 			'redo'
 		],
 		image: {
-			toolbar: [ 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
+			toolbar: [ 'imageStyle:block', 'imageStyle:side', '|', 'imageTextAlternative' ]
 		},
 		table: {
 			contentToolbar: [

diff --git a/packages/ckeditor5-engine/tests/manual/tickets/1088/1.js b/packages/ckeditor5-engine/tests/manual/tickets/1088/1.js
@@ -27,7 +27,7 @@ ClassicEditor
 		image: {
 			toolbar: [
 				'imageStyle:inline',
-				'imageStyle:full',
+				'imageStyle:block',
 				'imageStyle:side',
 				'|',
 				'imageTextAlternative'

diff --git a/packages/ckeditor5-font/tests/integration.js b/packages/ckeditor5-font/tests/integration.js
@@ -22,7 +22,7 @@ describe( 'Integration test Font', () => {
 			.create( element, {
 				plugins: [ Font, ArticlePluginSet ],
 				image: {
-					toolbar: [ 'imageStyle:full', 'imageStyle:side' ]
+					toolbar: [ 'imageStyle:block', 'imageStyle:side' ]
 				}
 			} )
 			.then( newEditor => {
@@ -72,7 +72,7 @@ describe( 'Integration test Font', () => {
 						supportAllValues: true
 					},
 					image: {
-						toolbar: [ 'imageStyle:full', 'imageStyle:side' ]
+						toolbar: [ 'imageStyle:block', 'imageStyle:side' ]
 					}
 				} )
 				.then( editor => {
@@ -118,7 +118,7 @@ describe( 'Integration test Font', () => {
 						supportAllValues: true
 					},
 					image: {
-						toolbar: [ 'imageStyle:full', 'imageStyle:side' ]
+						toolbar: [ 'imageStyle:block', 'imageStyle:side' ]
 					}
 				} )
 				.then( editor => {
@@ -182,7 +182,7 @@ describe( 'Integration test Font', () => {
 						supportAllValues: true
 					},
 					image: {
-						toolbar: [ 'imageStyle:full', 'imageStyle:side' ]
+						toolbar: [ 'imageStyle:block', 'imageStyle:side' ]
 					}
 				} )
 				.then( editor => {

diff --git a/packages/ckeditor5-html-embed/tests/manual/htmlembed.js b/packages/ckeditor5-html-embed/tests/manual/htmlembed.js
@@ -82,7 +82,7 @@ async function reloadEditor( config = {} ) {
 			'undo', 'redo', '|', 'htmlEmbed', 'mediaEmbed'
 		],
 		image: {
-			toolbar: [ 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
+			toolbar: [ 'imageStyle:block', 'imageStyle:side', '|', 'imageTextAlternative' ]
 		}
 	};