Sfoglia il codice sorgente

Merge branch 'master' into t/1556

Maciej Gołaszewski 7 anni fa
parent
commit
4f9ec3ebab

+ 1 - 1
packages/ckeditor5-engine/src/conversion/conversion.js

@@ -418,7 +418,7 @@ export default class Conversion {
 				upcastElementToAttribute( {
 					view,
 					model,
-					priority: definition.priority
+					converterPriority: definition.priority
 				} )
 			);
 		}

+ 1 - 1
packages/ckeditor5-engine/src/conversion/downcastdispatcher.js

@@ -294,7 +294,7 @@ export default class DowncastDispatcher {
 
 			// Do not fire event if the attribute has been consumed.
 			if ( this.conversionApi.consumable.test( selection, 'attribute:' + data.attributeKey ) ) {
-				this.fire( 'attribute:' + data.attributeKey, data, this.conversionApi );
+				this.fire( 'attribute:' + data.attributeKey + ':$text', data, this.conversionApi );
 			}
 		}
 

+ 1 - 1
packages/ckeditor5-engine/src/conversion/upcast-converters.js

@@ -151,7 +151,7 @@ export function upcastElementToAttribute( config ) {
 	const eventName = elementName ? 'element:' + elementName : 'element';
 
 	return dispatcher => {
-		dispatcher.on( eventName, converter, { priority: config.converterPriority || 'normal' } );
+		dispatcher.on( eventName, converter, { priority: config.converterPriority || 'low' } );
 	};
 }
 

+ 1 - 1
packages/ckeditor5-engine/tests/conversion/downcastdispatcher.js

@@ -319,7 +319,7 @@ describe( 'DowncastDispatcher', () => {
 
 			dispatcher.convertSelection( doc.selection, model.markers, [] );
 
-			expect( dispatcher.fire.calledWith( 'attribute:bold' ) ).to.be.true;
+			expect( dispatcher.fire.calledWith( 'attribute:bold:$text' ) ).to.be.true;
 		} );
 
 		it( 'should not fire attributes events if attribute has been consumed', () => {