Преглед на файлове

Other: Unify ViewElement converters for attribute and element.

Maciej Gołaszewski преди 8 години
родител
ревизия
48d812bdea
променени са 2 файла, в които са добавени 10 реда и са изтрити 12 реда
  1. 2 2
      packages/ckeditor5-font/src/fontsize/fontsizeediting.js
  2. 8 10
      packages/ckeditor5-font/tests/fontsize/fontsizeediting.js

+ 2 - 2
packages/ckeditor5-font/src/fontsize/fontsizeediting.js

@@ -39,10 +39,10 @@ export default class FontSizeEditing extends Plugin {
 
 		for ( const item of this.configuredItems ) {
 			// Covert view to model.
-			viewToModelAttribute( 'fontSize', item.model, item.view, [ data.viewToModel ] );
+			viewToModelAttribute( 'fontSize', item, [ data.viewToModel ] );
 
 			// Covert model to view.
-			modelAttributeToView( 'fontSize', item.model, item.view, [ data.modelToView, editing.modelToView ] );
+			modelAttributeToView( 'fontSize', item, [ data.modelToView, editing.modelToView ] );
 
 			// Add command.
 		}

+ 8 - 10
packages/ckeditor5-font/tests/fontsize/fontsizeediting.js

@@ -147,7 +147,7 @@ describe( 'FontSizeEditing', () => {
 								model: 'my',
 								view: {
 									name: 'mark',
-									style: 'font-size: 30px',
+									style: { 'font-size': '30px' },
 									class: 'my-style'
 								}
 							}
@@ -217,15 +217,13 @@ describe( 'FontSizeEditing', () => {
 								label: 'Hybrid',
 								model: 'complex',
 								view: {
-									to: {
-										name: 'span',
-										class: [ 'text-complex' ]
-									},
-									from: [
-										{ name: 'span', style: { 'font-size': '77em' } },
-										{ name: 'span', attribute: { 'data-size': '77em' } }
-									]
-								}
+									name: 'span',
+									class: [ 'text-complex' ]
+								},
+								acceptsAlso: [
+									{ name: 'span', style: { 'font-size': '77em' } },
+									{ name: 'span', attribute: { 'data-size': '77em' } }
+								]
 							}
 						]
 					}