8
0
Просмотр исходного кода

Merge branch 'master' into t/ckeditor5/645

Aleksander Nowodzinski 8 лет назад
Родитель
Сommit
95163c90db

+ 3 - 3
packages/ckeditor5-image/src/image/imageengine.js

@@ -66,7 +66,7 @@ export default class ImageEngine extends Plugin {
 
 		// Build converter for view img element to model image element.
 		buildViewConverter().for( data.viewToModel )
-			.from( { name: 'img', attribute: { src: /./ } } )
+			.from( { name: 'img', attribute: { src: true } } )
 			.toElement( viewImage => new ModelElement( 'image', { src: viewImage.getAttribute( 'src' ) } ) );
 
 		data.viewToModel.on( 'element:img', convertHoistableImage, { priority: 'low' } );
@@ -76,13 +76,13 @@ export default class ImageEngine extends Plugin {
 		// Note that by default attribute converters are added with `low` priority.
 		// This converter will be thus fired after `convertHoistableImage` converter.
 		buildViewConverter().for( data.viewToModel )
-			.from( { name: 'img', attribute: { alt: /./ } } )
+			.from( { name: 'img', attribute: { alt: true } } )
 			.consuming( { attribute: [ 'alt' ] } )
 			.toAttribute( viewImage => ( { key: 'alt', value: viewImage.getAttribute( 'alt' ) } ) );
 
 		// Build converter for srcset attribute.
 		buildViewConverter().for( data.viewToModel )
-			.from( { name: 'img', attribute: { srcset: /./ } } )
+			.from( { name: 'img', attribute: { srcset: true } } )
 			.consuming( { attribute: [ 'srcset' ] } )
 			.toAttribute( viewImage => {
 				const value = {

+ 1 - 4
packages/ckeditor5-image/src/imagestyle/converters.js

@@ -18,10 +18,7 @@ import { isImage } from '../image/utils';
  */
 export function modelToViewStyleAttribute( styles ) {
 	return ( evt, data, consumable, conversionApi ) => {
-		const eventType = evt.name.split( ':' )[ 0 ];
-		const consumableType = eventType + ':imageStyle';
-
-		if ( !consumable.consume( data.item, consumableType ) ) {
+		if ( !consumable.consume( data.item, evt.name ) ) {
 			return;
 		}
 

+ 2 - 6
packages/ckeditor5-image/tests/image/imageengine.js

@@ -88,11 +88,9 @@ describe( 'ImageEngine', () => {
 
 			it( 'should not convert srcset attribute if is already consumed', () => {
 				editor.data.modelToView.on( 'attribute:srcset:image', ( evt, data, consumable ) => {
-					const parts = evt.name.split( ':' );
-					const consumableType = parts[ 0 ] + ':' + parts[ 1 ];
 					const modelImage = data.item;
 
-					consumable.consume( modelImage, consumableType );
+					consumable.consume( modelImage, evt.name );
 				}, { priority: 'high' } );
 
 				setModelData( model,
@@ -559,11 +557,9 @@ describe( 'ImageEngine', () => {
 
 			it( 'should not convert srcset attribute if is already consumed', () => {
 				editor.editing.modelToView.on( 'attribute:srcset:image', ( evt, data, consumable ) => {
-					const parts = evt.name.split( ':' );
-					const consumableType = parts[ 0 ] + ':' + parts[ 1 ];
 					const modelImage = data.item;
 
-					consumable.consume( modelImage, consumableType );
+					consumable.consume( modelImage, evt.name );
 				}, { priority: 'high' } );
 
 				setModelData( model,