@ckeditor/ckeditor5-image 33.0.0 → 34.2.0

package/lang/translations/jv.po

@@ -0,0 +1,113 @@
+# Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+#
+#                                     !!! IMPORTANT !!!
+#
+#         Before you edit this file, please keep in mind that contributing to the project
+#                translations is possible ONLY via the Transifex online service.
+#
+#         To submit your translations, visit https://www.transifex.com/ckeditor/ckeditor5.
+#
+#                   To learn more, check out the official contributor's guide:
+#     https://ckeditor.com/docs/ckeditor5/latest/framework/guides/contributing/contributing.html
+#
+msgid ""
+msgstr ""
+"Language-Team: Javanese (https://www.transifex.com/ckeditor/teams/11143/jv/)\n"
+"Language: jv\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgctxt "The label for the image widget."
+msgid "image widget"
+msgstr ""
+
+msgctxt "The label for the image style button that wraps text around the image."
+msgid "Wrap text"
+msgstr ""
+
+msgctxt "The label for the image style button that breaks the text around the image."
+msgid "Break text"
+msgstr ""
+
+msgctxt "The label for the image style button that places the image inside the line of text."
+msgid "In line"
+msgstr ""
+
+msgctxt "The label for the Side image option."
+msgid "Side image"
+msgstr ""
+
+msgctxt "The label for the Full size image option."
+msgid "Full size image"
+msgstr "Gambar ukuran kebak"
+
+msgctxt "The label for the Left aligned image option."
+msgid "Left aligned image"
+msgstr "Gambar ing kiwa"
+
+msgctxt "The label for the Centered image option."
+msgid "Centered image"
+msgstr "Gambar ing tengah"
+
+msgctxt "The label for the Right aligned image option."
+msgid "Right aligned image"
+msgstr "Gambar ing tengen"
+
+msgctxt "The label for the Change image text alternative button."
+msgid "Change image text alternative"
+msgstr ""
+
+msgctxt "The label for the image text alternative input."
+msgid "Text alternative"
+msgstr ""
+
+msgctxt "The placeholder text for the image caption displayed when the caption is empty."
+msgid "Enter image caption"
+msgstr ""
+
+msgctxt "The label for the insert image toolbar button."
+msgid "Insert image"
+msgstr "Tambahaken gambar"
+
+msgctxt "The title of the notification displayed when upload fails."
+msgid "Upload failed"
+msgstr ""
+
+msgctxt "The label used by assistive technologies describing an image toolbar attached to an image widget."
+msgid "Image toolbar"
+msgstr ""
+
+msgctxt "The label used for the dropdown in the image toolbar containing defined resize options."
+msgid "Resize image"
+msgstr ""
+
+msgctxt "The label used for the standalone resize options buttons in the image toolbar."
+msgid "Resize image to %0"
+msgstr ""
+
+msgctxt "The accessibility label of the standalone image resize reset option button in the image toolbar for screen readers."
+msgid "Resize image to the original size"
+msgstr ""
+
+msgctxt "The default label for the resize option that resets the size of the image."
+msgid "Original"
+msgstr "Asli"
+
+msgctxt "The accessibility label of the image resize dropdown for screen readers."
+msgid "Image resize list"
+msgstr ""
+
+msgctxt "The label of the form submit button if the image source URL input has no value."
+msgid "Insert"
+msgstr "Tambah"
+
+msgctxt "The label of the form submit button if the image source URL input has a value."
+msgid "Update"
+msgstr ""
+
+msgctxt "The input label for the Insert image via URL form."
+msgid "Insert image via URL"
+msgstr "Tambah gambar saking URL"
+
+msgctxt "The input label for the Insert image via URL form for a pre-existing image."
+msgid "Update image URL"
+msgstr ""

package/lang/translations/lv.po

@@ -22,15 +22,15 @@ msgstr "attēla sīkrīks"
 
 msgctxt "The label for the image style button that wraps text around the image."
 msgid "Wrap text"
-msgstr ""
+msgstr "Aplauzt tekstu"
 
 msgctxt "The label for the image style button that breaks the text around the image."
 msgid "Break text"
-msgstr ""
+msgstr "Pārtraukt tekstu"
 
 msgctxt "The label for the image style button that places the image inside the line of text."
 msgid "In line"
-msgstr ""
+msgstr "Rindā"
 
 msgctxt "The label for the Side image option."
 msgid "Side image"
@@ -78,36 +78,36 @@ msgstr "Attēlu rīkjosla"
 
 msgctxt "The label used for the dropdown in the image toolbar containing defined resize options."
 msgid "Resize image"
-msgstr ""
+msgstr "Mainīt attēla izmērus"
 
 msgctxt "The label used for the standalone resize options buttons in the image toolbar."
 msgid "Resize image to %0"
-msgstr ""
+msgstr "Mainīt attēla izmēru uz %0"
 
 msgctxt "The accessibility label of the standalone image resize reset option button in the image toolbar for screen readers."
 msgid "Resize image to the original size"
-msgstr ""
+msgstr "Mainīt attēla izmēru uz oriģinālo izmēru"
 
 msgctxt "The default label for the resize option that resets the size of the image."
 msgid "Original"
-msgstr ""
+msgstr "Oriģināls"
 
 msgctxt "The accessibility label of the image resize dropdown for screen readers."
 msgid "Image resize list"
-msgstr ""
+msgstr "Attēla izmēru saraksts"
 
 msgctxt "The label of the form submit button if the image source URL input has no value."
 msgid "Insert"
-msgstr ""
+msgstr "Ievietot"
 
 msgctxt "The label of the form submit button if the image source URL input has a value."
 msgid "Update"
-msgstr ""
+msgstr "Atjaunināt"
 
 msgctxt "The input label for the Insert image via URL form."
 msgid "Insert image via URL"
-msgstr ""
+msgstr "Ievietot attēlu, izmantojot saiti"
 
 msgctxt "The input label for the Insert image via URL form for a pre-existing image."
 msgid "Update image URL"
-msgstr ""
+msgstr "Labot attēla avota saiti"

package/lang/translations/pt-br.po

@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/ckeditor/teams/11143/pt_BR/)\n"
 "Language: pt_BR\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
 msgctxt "The label for the image widget."
 msgid "image widget"

package/lang/translations/pt.po

@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Language-Team: Portuguese (https://www.transifex.com/ckeditor/teams/11143/pt/)\n"
 "Language: pt\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
 msgctxt "The label for the image widget."
 msgid "image widget"

package/lang/translations/sk.po

@@ -22,15 +22,15 @@ msgstr "widget obrázka"
 
 msgctxt "The label for the image style button that wraps text around the image."
 msgid "Wrap text"
-msgstr ""
+msgstr "Obtekanie textu"
 
 msgctxt "The label for the image style button that breaks the text around the image."
 msgid "Break text"
-msgstr ""
+msgstr "Zalomenie textu"
 
 msgctxt "The label for the image style button that places the image inside the line of text."
 msgid "In line"
-msgstr ""
+msgstr "V riadku"
 
 msgctxt "The label for the Side image option."
 msgid "Side image"

package/lang/translations/ur.po

@@ -0,0 +1,113 @@
+# Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+#
+#                                     !!! IMPORTANT !!!
+#
+#         Before you edit this file, please keep in mind that contributing to the project
+#                translations is possible ONLY via the Transifex online service.
+#
+#         To submit your translations, visit https://www.transifex.com/ckeditor/ckeditor5.
+#
+#                   To learn more, check out the official contributor's guide:
+#     https://ckeditor.com/docs/ckeditor5/latest/framework/guides/contributing/contributing.html
+#
+msgid ""
+msgstr ""
+"Language-Team: Urdu (https://www.transifex.com/ckeditor/teams/11143/ur/)\n"
+"Language: ur\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "The label for the image widget."
+msgid "image widget"
+msgstr "آلۂ عکس"
+
+msgctxt "The label for the image style button that wraps text around the image."
+msgid "Wrap text"
+msgstr "ملفوف متن"
+
+msgctxt "The label for the image style button that breaks the text around the image."
+msgid "Break text"
+msgstr "متن تقسیم کریں"
+
+msgctxt "The label for the image style button that places the image inside the line of text."
+msgid "In line"
+msgstr ""
+
+msgctxt "The label for the Side image option."
+msgid "Side image"
+msgstr "عکس بہ پہلو"
+
+msgctxt "The label for the Full size image option."
+msgid "Full size image"
+msgstr "مکمل پہمائش کا عکس"
+
+msgctxt "The label for the Left aligned image option."
+msgid "Left aligned image"
+msgstr ""
+
+msgctxt "The label for the Centered image option."
+msgid "Centered image"
+msgstr ""
+
+msgctxt "The label for the Right aligned image option."
+msgid "Right aligned image"
+msgstr ""
+
+msgctxt "The label for the Change image text alternative button."
+msgid "Change image text alternative"
+msgstr ""
+
+msgctxt "The label for the image text alternative input."
+msgid "Text alternative"
+msgstr ""
+
+msgctxt "The placeholder text for the image caption displayed when the caption is empty."
+msgid "Enter image caption"
+msgstr ""
+
+msgctxt "The label for the insert image toolbar button."
+msgid "Insert image"
+msgstr ""
+
+msgctxt "The title of the notification displayed when upload fails."
+msgid "Upload failed"
+msgstr ""
+
+msgctxt "The label used by assistive technologies describing an image toolbar attached to an image widget."
+msgid "Image toolbar"
+msgstr "آلہ جات برائے عکس"
+
+msgctxt "The label used for the dropdown in the image toolbar containing defined resize options."
+msgid "Resize image"
+msgstr ""
+
+msgctxt "The label used for the standalone resize options buttons in the image toolbar."
+msgid "Resize image to %0"
+msgstr ""
+
+msgctxt "The accessibility label of the standalone image resize reset option button in the image toolbar for screen readers."
+msgid "Resize image to the original size"
+msgstr ""
+
+msgctxt "The default label for the resize option that resets the size of the image."
+msgid "Original"
+msgstr ""
+
+msgctxt "The accessibility label of the image resize dropdown for screen readers."
+msgid "Image resize list"
+msgstr ""
+
+msgctxt "The label of the form submit button if the image source URL input has no value."
+msgid "Insert"
+msgstr ""
+
+msgctxt "The label of the form submit button if the image source URL input has a value."
+msgid "Update"
+msgstr ""
+
+msgctxt "The input label for the Insert image via URL form."
+msgid "Insert image via URL"
+msgstr ""
+
+msgctxt "The input label for the Insert image via URL form for a pre-existing image."
+msgid "Update image URL"
+msgstr ""

package/lang/translations/zh-cn.po

@@ -18,19 +18,19 @@ msgstr ""
 
 msgctxt "The label for the image widget."
 msgid "image widget"
-msgstr "图像小部件"
+msgstr "图片组件"
 
 msgctxt "The label for the image style button that wraps text around the image."
 msgid "Wrap text"
-msgstr ""
+msgstr "文字环绕"
 
 msgctxt "The label for the image style button that breaks the text around the image."
 msgid "Break text"
-msgstr ""
+msgstr "文字断行"
 
 msgctxt "The label for the image style button that places the image inside the line of text."
 msgid "In line"
-msgstr ""
+msgstr "行内"
 
 msgctxt "The label for the Side image option."
 msgid "Side image"
@@ -38,7 +38,7 @@ msgstr "图片侧边显示"
 
 msgctxt "The label for the Full size image option."
 msgid "Full size image"
-msgstr "图片通栏显示"
+msgstr "全尺寸图片"
 
 msgctxt "The label for the Left aligned image option."
 msgid "Left aligned image"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-image",
-  "version": "33.0.0",
+  "version": "34.2.0",
   "description": "Image feature for CKEditor 5.",
   "keywords": [
     "ckeditor",
@@ -12,40 +12,40 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "@ckeditor/ckeditor5-ui": "^33.0.0",
-    "ckeditor5": "^33.0.0",
+    "@ckeditor/ckeditor5-ui": "^34.2.0",
+    "ckeditor5": "^34.2.0",
     "lodash-es": "^4.17.15"
   },
   "devDependencies": {
-    "@ckeditor/ckeditor5-adapter-ckfinder": "^33.0.0",
-    "@ckeditor/ckeditor5-autoformat": "^33.0.0",
-    "@ckeditor/ckeditor5-basic-styles": "^33.0.0",
-    "@ckeditor/ckeditor5-block-quote": "^33.0.0",
-    "@ckeditor/ckeditor5-ckfinder": "^33.0.0",
-    "@ckeditor/ckeditor5-clipboard": "^33.0.0",
-    "@ckeditor/ckeditor5-cloud-services": "^33.0.0",
-    "@ckeditor/ckeditor5-core": "^33.0.0",
-    "@ckeditor/ckeditor5-dev-utils": "^28.0.1",
-    "@ckeditor/ckeditor5-easy-image": "^33.0.0",
-    "@ckeditor/ckeditor5-editor-classic": "^33.0.0",
-    "@ckeditor/ckeditor5-engine": "^33.0.0",
-    "@ckeditor/ckeditor5-enter": "^33.0.0",
-    "@ckeditor/ckeditor5-essentials": "^33.0.0",
-    "@ckeditor/ckeditor5-heading": "^33.0.0",
-    "@ckeditor/ckeditor5-html-embed": "^33.0.0",
-    "@ckeditor/ckeditor5-indent": "^33.0.0",
-    "@ckeditor/ckeditor5-link": "^33.0.0",
-    "@ckeditor/ckeditor5-list": "^33.0.0",
-    "@ckeditor/ckeditor5-media-embed": "^33.0.0",
-    "@ckeditor/ckeditor5-paragraph": "^33.0.0",
-    "@ckeditor/ckeditor5-table": "^33.0.0",
-    "@ckeditor/ckeditor5-theme-lark": "^33.0.0",
-    "@ckeditor/ckeditor5-typing": "^33.0.0",
-    "@ckeditor/ckeditor5-undo": "^33.0.0",
-    "@ckeditor/ckeditor5-upload": "^33.0.0",
-    "@ckeditor/ckeditor5-utils": "^33.0.0",
-    "@ckeditor/ckeditor5-watchdog": "^33.0.0",
-    "@ckeditor/ckeditor5-widget": "^33.0.0",
+    "@ckeditor/ckeditor5-adapter-ckfinder": "^34.2.0",
+    "@ckeditor/ckeditor5-autoformat": "^34.2.0",
+    "@ckeditor/ckeditor5-basic-styles": "^34.2.0",
+    "@ckeditor/ckeditor5-block-quote": "^34.2.0",
+    "@ckeditor/ckeditor5-ckfinder": "^34.2.0",
+    "@ckeditor/ckeditor5-clipboard": "^34.2.0",
+    "@ckeditor/ckeditor5-cloud-services": "^34.2.0",
+    "@ckeditor/ckeditor5-core": "^34.2.0",
+    "@ckeditor/ckeditor5-dev-utils": "^30.0.0",
+    "@ckeditor/ckeditor5-easy-image": "^34.2.0",
+    "@ckeditor/ckeditor5-editor-classic": "^34.2.0",
+    "@ckeditor/ckeditor5-engine": "^34.2.0",
+    "@ckeditor/ckeditor5-enter": "^34.2.0",
+    "@ckeditor/ckeditor5-essentials": "^34.2.0",
+    "@ckeditor/ckeditor5-heading": "^34.2.0",
+    "@ckeditor/ckeditor5-html-embed": "^34.2.0",
+    "@ckeditor/ckeditor5-indent": "^34.2.0",
+    "@ckeditor/ckeditor5-link": "^34.2.0",
+    "@ckeditor/ckeditor5-list": "^34.2.0",
+    "@ckeditor/ckeditor5-media-embed": "^34.2.0",
+    "@ckeditor/ckeditor5-paragraph": "^34.2.0",
+    "@ckeditor/ckeditor5-table": "^34.2.0",
+    "@ckeditor/ckeditor5-theme-lark": "^34.2.0",
+    "@ckeditor/ckeditor5-typing": "^34.2.0",
+    "@ckeditor/ckeditor5-undo": "^34.2.0",
+    "@ckeditor/ckeditor5-upload": "^34.2.0",
+    "@ckeditor/ckeditor5-utils": "^34.2.0",
+    "@ckeditor/ckeditor5-watchdog": "^34.2.0",
+    "@ckeditor/ckeditor5-widget": "^34.2.0",
     "webpack": "^5.58.1",
     "webpack-cli": "^4.9.0"
   },

package/src/image/converters.js

@@ -82,7 +82,7 @@ export function upcastImageFigure( imageUtils ) {
  * @returns {Function}
  */
 export function upcastPicture( imageUtils ) {
-	const sourceAttributeNames = [ 'srcset', 'media', 'type' ];
+	const sourceAttributeNames = [ 'srcset', 'media', 'type', 'sizes' ];
 
 	return dispatcher => {
 		dispatcher.on( 'element:picture', converter );
@@ -238,8 +238,7 @@ export function downcastSourcesAttribute( imageUtils ) {
 			const pictureElement = viewWriter.createContainerElement( 'picture', null,
 				data.attributeNewValue.map( sourceAttributes => {
 					return viewWriter.createEmptyElement( 'source', sourceAttributes );
-				} ),
-				{ isAllowedInsideAttributeElement: true }
+				} )
 			);
 
 			// Collect all wrapping attribute elements.

package/src/image/imageblockediting.js

@@ -62,9 +62,7 @@ export default class ImageBlockEditing extends Plugin {
 
 		// Converters 'alt' and 'srcset' are added in 'ImageEditing' plugin.
 		schema.register( 'imageBlock', {
-			isObject: true,
-			isBlock: true,
-			allowWhere: '$block',
+			inheritAllFrom: '$blockObject',
 			allowAttributes: [ 'alt', 'src', 'srcset' ]
 		} );
 

package/src/image/imageinlineediting.js

@@ -61,10 +61,7 @@ export default class ImageInlineEditing extends Plugin {
 
 		// Converters 'alt' and 'srcset' are added in 'ImageEditing' plugin.
 		schema.register( 'imageInline', {
-			isObject: true,
-			isInline: true,
-			allowWhere: '$text',
-			allowAttributesOf: '$text',
+			inheritAllFrom: '$inlineObject',
 			allowAttributes: [ 'alt', 'src', 'srcset' ]
 		} );
 

package/src/image/utils.js

@@ -22,8 +22,7 @@ import { first } from 'ckeditor5/src/utils';
  */
 export function createInlineImageViewElement( writer ) {
 	return writer.createContainerElement( 'span', { class: 'image-inline' },
-		writer.createEmptyElement( 'img' ),
-		{ isAllowedInsideAttributeElement: true }
+		writer.createEmptyElement( 'img' )
 	);
 }
 
@@ -54,18 +53,20 @@ export function createBlockImageViewElement( writer ) {
  * @returns {module:engine/view/matcher~MatcherPattern}
  */
 export function getImgViewElementMatcher( editor, matchImageType ) {
-	if ( editor.plugins.has( 'ImageInlineEditing' ) !== editor.plugins.has( 'ImageBlockEditing' ) ) {
-		return { name: 'img' };
-	}
-
 	const imageUtils = editor.plugins.get( 'ImageUtils' );
+	const areBothImagePluginsLoaded = editor.plugins.has( 'ImageInlineEditing' ) && editor.plugins.has( 'ImageBlockEditing' );
 
 	return element => {
-		// Check if view element is an `img`.
+		// Check if the matched view element is an <img>.
 		if ( !imageUtils.isInlineImageView( element ) ) {
 			return null;
 		}
 
+		// If just one of the plugins is loaded (block or inline), it will match all kinds of images.
+		if ( !areBothImagePluginsLoaded ) {
+			return getPositiveMatchPattern( element );
+		}
+
 		// The <img> can be standalone, wrapped in <figure>...</figure> (ImageBlock plugin) or
 		// wrapped in <figure><a>...</a></figure> (LinkImage plugin).
 		const imageType = element.findAncestor( imageUtils.isBlockImageView ) ? 'imageBlock' : 'imageInline';
@@ -74,8 +75,21 @@ export function getImgViewElementMatcher( editor, matchImageType ) {
 			return null;
 		}
 
-		return { name: true };
+		return getPositiveMatchPattern( element );
 	};
+
+	function getPositiveMatchPattern( element ) {
+		const pattern = {
+			name: true
+		};
+
+		// This will trigger src consumption (See https://github.com/ckeditor/ckeditor5/issues/11530).
+		if ( element.hasAttribute( 'src' ) ) {
+			pattern.attributes = [ 'src' ];
+		}
+
+		return pattern;
+	}
 }
 
 /**

package/src/imagestyle/imagestyleui.js

@@ -129,6 +129,7 @@ export default class ImageStyleUI extends Plugin {
 
 			const dropdownView = createDropdown( locale, SplitButtonView );
 			const splitButtonView = dropdownView.buttonView;
+			const splitButtonViewArrow = splitButtonView.arrowView;
 
 			addToolbarToDropdown( dropdownView, buttonViews );
 
@@ -138,6 +139,11 @@ export default class ImageStyleUI extends Plugin {
 				tooltip: true
 			} );
 
+			splitButtonViewArrow.unbind( 'label' );
+			splitButtonViewArrow.set( {
+				label: title
+			} );
+
 			splitButtonView.bind( 'icon' ).toMany( buttonViews, 'isOn', ( ...areOn ) => {
 				const index = areOn.findIndex( identity );
 

package/src/imageutils.js

@@ -103,18 +103,15 @@ export default class ImageUtils extends Plugin {
 		return model.change( writer => {
 			const imageElement = writer.createElement( imageType, attributes );
 
-			// If we want to insert a block image (for whatever reason) then we don't want to split text blocks.
-			// This applies only when we don't have the selectable specified (i.e., we insert multiple block images at once).
-			if ( !selectable && imageType != 'imageInline' ) {
-				selectable = findOptimalInsertionRange( selection, model );
-			}
-
-			model.insertContent( imageElement, selectable );
+			model.insertObject( imageElement, selectable, null, {
+				setSelection: 'on',
+				// If we want to insert a block image (for whatever reason) then we don't want to split text blocks.
+				// This applies only when we don't have the selectable specified (i.e., we insert multiple block images at once).
+				findOptimalPosition: !selectable && imageType != 'imageInline'
+			} );
 
 			// Inserting an image might've failed due to schema regulations.
 			if ( imageElement.parent ) {
-				writer.setSelection( imageElement, 'on' );
-
 				return imageElement;
 			}
 

package/src/index.js

@@ -30,3 +30,4 @@ export { default as ImageUpload } from './imageupload';
 export { default as ImageUploadEditing } from './imageupload/imageuploadediting';
 export { default as ImageUploadProgress } from './imageupload/imageuploadprogress';
 export { default as ImageUploadUI } from './imageupload/imageuploadui';
+export { default as PictureEditing } from './pictureediting';