@ckeditor/ckeditor5-image 33.0.0 → 34.0.0

package/build/translations/en-au.js

@@ -1 +1 @@
-!function(e){const i=e["en-au"]=e["en-au"]||{};i.dictionary=Object.assign(i.dictionary||{},{"Break text":"","Centered image":"Centred image","Change image text alternative":"Change image text alternative","Enter image caption":"Enter image caption","Full size image":"Full size image","Image resize list":"Image resize list","Image toolbar":"Image toolbar","image widget":"image widget","In line":"",Insert:"Insert","Insert image":"Insert image","Insert image via URL":"Insert image via URL","Left aligned image":"Left aligned image",Original:"Original","Resize image":"Resize image","Resize image to %0":"Resize image to %0","Resize image to the original size":"Resize image to the original size","Right aligned image":"Right aligned image","Side image":"Side image","Text alternative":"Text alternative",Update:"Update","Update image URL":"Update image URL","Upload failed":"Upload failed","Wrap text":""})}(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
+!function(e){const i=e["en-au"]=e["en-au"]||{};i.dictionary=Object.assign(i.dictionary||{},{"Break text":"Break text","Centered image":"Centred image","Change image text alternative":"Change image text alternative","Enter image caption":"Enter image caption","Full size image":"Full size image","Image resize list":"Image resize list","Image toolbar":"Image toolbar","image widget":"image widget","In line":"In line",Insert:"Insert","Insert image":"Insert image","Insert image via URL":"Insert image via URL","Left aligned image":"Left aligned image",Original:"Original","Resize image":"Resize image","Resize image to %0":"Resize image to %0","Resize image to the original size":"Resize image to the original size","Right aligned image":"Right aligned image","Side image":"Side image","Text alternative":"Text alternative",Update:"Update","Update image URL":"Update image URL","Upload failed":"Upload failed","Wrap text":"Wrap text"})}(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));

package/build/translations/hr.js

@@ -1 +1 @@
-!function(e){const i=e.hr=e.hr||{};i.dictionary=Object.assign(i.dictionary||{},{"Break text":"","Centered image":"Centrirana slika","Change image text alternative":"Promijeni alternativni tekst slike","Enter image caption":"Unesite naslov slike","Full size image":"Slika pune veličine","Image resize list":"","Image toolbar":"Traka za slike","image widget":"Slika widget","In line":"",Insert:"","Insert image":"Umetni sliku","Insert image via URL":"","Left aligned image":"Lijevo poravnata slika",Original:"","Resize image":"","Resize image to %0":"","Resize image to the original size":"","Right aligned image":"Slika poravnata desno","Side image":"Slika sa strane","Text alternative":"Alternativni tekst",Update:"","Update image URL":"","Upload failed":"Slanje nije uspjelo","Wrap text":""})}(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
+!function(i){const e=i.hr=i.hr||{};e.dictionary=Object.assign(e.dictionary||{},{"Break text":"Prelomi tekst","Centered image":"Centrirana slika","Change image text alternative":"Promijeni alternativni tekst slike","Enter image caption":"Unesite naslov slike","Full size image":"Slika pune veličine","Image resize list":"Lista veličina slika","Image toolbar":"Traka za slike","image widget":"Slika widget","In line":"U istom redu",Insert:"Ubaci","Insert image":"Umetni sliku","Insert image via URL":"Ubaci sliku putem URLa","Left aligned image":"Lijevo poravnata slika",Original:"Original","Resize image":"Promijeni veličinu slike","Resize image to %0":"Promijeni veličinu slike u %0","Resize image to the original size":"Vrati veličinu slike na originalnu veličinu","Right aligned image":"Slika poravnata desno","Side image":"Slika sa strane","Text alternative":"Alternativni tekst",Update:"Snimi","Update image URL":"Snimi URL slike","Upload failed":"Slanje nije uspjelo","Wrap text":"Prelamanje teksta"})}(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));

package/build/translations/jv.js

@@ -0,0 +1 @@
+!function(a){const e=a.jv=a.jv||{};e.dictionary=Object.assign(e.dictionary||{},{"Break text":"","Centered image":"Gambar ing tengah","Change image text alternative":"","Enter image caption":"","Full size image":"Gambar ukuran kebak","Image resize list":"","Image toolbar":"","image widget":"","In line":"",Insert:"Tambah","Insert image":"Tambahaken gambar","Insert image via URL":"Tambah gambar saking URL","Left aligned image":"Gambar ing kiwa",Original:"Asli","Resize image":"","Resize image to %0":"","Resize image to the original size":"","Right aligned image":"Gambar ing tengen","Side image":"","Text alternative":"",Update:"","Update image URL":"","Upload failed":"","Wrap text":""})}(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));

package/build/translations/sk.js

@@ -1 +1 @@
-!function(e){const a=e.sk=e.sk||{};a.dictionary=Object.assign(a.dictionary||{},{"Break text":"","Centered image":"Zarovnať na stred","Change image text alternative":"Zmeňte alternatívny text obrázka","Enter image caption":"Vložte popis obrázka","Full size image":"Obrázok v plnej veľkosti","Image resize list":"Zoznam možností zmeny veľkosti","Image toolbar":"Panel nástrojov obrázka","image widget":"widget obrázka","In line":"",Insert:"Vložiť","Insert image":"Vložiť obrázok","Insert image via URL":"Vložiť obrázok pomocou URL","Left aligned image":"Zarovnať vľavo",Original:"Originál","Resize image":"Zmeniť veľkosť obrázka","Resize image to %0":"Zmeniť veľkosť na %0","Resize image to the original size":"Zmeniť veľkosť na pôvodnú","Right aligned image":"Zarovnať vpravo","Side image":"Bočný obrázok","Text alternative":"Alternatívny text",Update:"Aktualizovať","Update image URL":"Aktualizovať URL obrázka","Upload failed":"Nahrávanie zlyhalo","Wrap text":""})}(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
+!function(e){const a=e.sk=e.sk||{};a.dictionary=Object.assign(a.dictionary||{},{"Break text":"Zalomenie textu","Centered image":"Zarovnať na stred","Change image text alternative":"Zmeňte alternatívny text obrázka","Enter image caption":"Vložte popis obrázka","Full size image":"Obrázok v plnej veľkosti","Image resize list":"Zoznam možností zmeny veľkosti","Image toolbar":"Panel nástrojov obrázka","image widget":"widget obrázka","In line":"V riadku",Insert:"Vložiť","Insert image":"Vložiť obrázok","Insert image via URL":"Vložiť obrázok pomocou URL","Left aligned image":"Zarovnať vľavo",Original:"Originál","Resize image":"Zmeniť veľkosť obrázka","Resize image to %0":"Zmeniť veľkosť na %0","Resize image to the original size":"Zmeniť veľkosť na pôvodnú","Right aligned image":"Zarovnať vpravo","Side image":"Bočný obrázok","Text alternative":"Alternatívny text",Update:"Aktualizovať","Update image URL":"Aktualizovať URL obrázka","Upload failed":"Nahrávanie zlyhalo","Wrap text":"Obtekanie textu"})}(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));

package/lang/translations/en-au.po

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

package/lang/translations/hr.po

@@ -22,15 +22,15 @@ msgstr "Slika widget"
 
 msgctxt "The label for the image style button that wraps text around the image."
 msgid "Wrap text"
-msgstr ""
+msgstr "Prelamanje teksta"
 
 msgctxt "The label for the image style button that breaks the text around the image."
 msgid "Break text"
-msgstr ""
+msgstr "Prelomi tekst"
 
 msgctxt "The label for the image style button that places the image inside the line of text."
 msgid "In line"
-msgstr ""
+msgstr "U istom redu"
 
 msgctxt "The label for the Side image option."
 msgid "Side image"
@@ -78,36 +78,36 @@ msgstr "Traka za slike"
 
 msgctxt "The label used for the dropdown in the image toolbar containing defined resize options."
 msgid "Resize image"
-msgstr ""
+msgstr "Promijeni veličinu slike"
 
 msgctxt "The label used for the standalone resize options buttons in the image toolbar."
 msgid "Resize image to %0"
-msgstr ""
+msgstr "Promijeni veličinu slike u %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 "Vrati veličinu slike na originalnu veličinu"
 
 msgctxt "The default label for the resize option that resets the size of the image."
 msgid "Original"
-msgstr ""
+msgstr "Original"
 
 msgctxt "The accessibility label of the image resize dropdown for screen readers."
 msgid "Image resize list"
-msgstr ""
+msgstr "Lista veličina slika"
 
 msgctxt "The label of the form submit button if the image source URL input has no value."
 msgid "Insert"
-msgstr ""
+msgstr "Ubaci"
 
 msgctxt "The label of the form submit button if the image source URL input has a value."
 msgid "Update"
-msgstr ""
+msgstr "Snimi"
 
 msgctxt "The input label for the Insert image via URL form."
 msgid "Insert image via URL"
-msgstr ""
+msgstr "Ubaci sliku putem URLa"
 
 msgctxt "The input label for the Insert image via URL form for a pre-existing image."
 msgid "Update image URL"
-msgstr ""
+msgstr "Snimi URL slike"

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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-image",
-  "version": "33.0.0",
+  "version": "34.0.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.0.0",
+    "ckeditor5": "^34.0.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.0.0",
+    "@ckeditor/ckeditor5-autoformat": "^34.0.0",
+    "@ckeditor/ckeditor5-basic-styles": "^34.0.0",
+    "@ckeditor/ckeditor5-block-quote": "^34.0.0",
+    "@ckeditor/ckeditor5-ckfinder": "^34.0.0",
+    "@ckeditor/ckeditor5-clipboard": "^34.0.0",
+    "@ckeditor/ckeditor5-cloud-services": "^34.0.0",
+    "@ckeditor/ckeditor5-core": "^34.0.0",
+    "@ckeditor/ckeditor5-dev-utils": "^30.0.0",
+    "@ckeditor/ckeditor5-easy-image": "^34.0.0",
+    "@ckeditor/ckeditor5-editor-classic": "^34.0.0",
+    "@ckeditor/ckeditor5-engine": "^34.0.0",
+    "@ckeditor/ckeditor5-enter": "^34.0.0",
+    "@ckeditor/ckeditor5-essentials": "^34.0.0",
+    "@ckeditor/ckeditor5-heading": "^34.0.0",
+    "@ckeditor/ckeditor5-html-embed": "^34.0.0",
+    "@ckeditor/ckeditor5-indent": "^34.0.0",
+    "@ckeditor/ckeditor5-link": "^34.0.0",
+    "@ckeditor/ckeditor5-list": "^34.0.0",
+    "@ckeditor/ckeditor5-media-embed": "^34.0.0",
+    "@ckeditor/ckeditor5-paragraph": "^34.0.0",
+    "@ckeditor/ckeditor5-table": "^34.0.0",
+    "@ckeditor/ckeditor5-theme-lark": "^34.0.0",
+    "@ckeditor/ckeditor5-typing": "^34.0.0",
+    "@ckeditor/ckeditor5-undo": "^34.0.0",
+    "@ckeditor/ckeditor5-upload": "^34.0.0",
+    "@ckeditor/ckeditor5-utils": "^34.0.0",
+    "@ckeditor/ckeditor5-watchdog": "^34.0.0",
+    "@ckeditor/ckeditor5-widget": "^34.0.0",
     "webpack": "^5.58.1",
     "webpack-cli": "^4.9.0"
   },

package/src/image/converters.js

@@ -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/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;
 			}