Kaynağa Gözat

Changed engine.treeController.ViewConsumable#createFromElement to createFrom.

Szymon Cofalik 9 yıl önce
ebeveyn
işleme
c13d2d23df

+ 8 - 8
packages/ckeditor5-engine/src/treecontroller/viewconsumable.js

@@ -563,25 +563,25 @@ export default class ViewConsumable {
 	 * @param {engine.treeController.ViewConsumable} [instance] If provided, given `ViewConsumable` instance will be used
 	 * to add all consumables. It will be returned instead of a new instance.
 	 */
-	static createFromElement( root, instance ) {
+	static createFrom( from, instance ) {
 		if ( !instance ) {
 			instance = new ViewConsumable();
 		}
 
-		// Add root itself if it is an element.
-		if ( root instanceof ViewElement ) {
-			instance.add( root, ViewConsumable.consumablesFromElement( root ) );
+		// Add `from` itself, if it is an element.
+		if ( from instanceof ViewElement ) {
+			instance.add( from, ViewConsumable.consumablesFromElement( from ) );
 		}
 
-		if ( root instanceof ViewDocumentFragment ) {
-			instance.add( root );
+		if ( from instanceof ViewDocumentFragment ) {
+			instance.add( from );
 		}
 
-		for ( let child of root.getChildren() ) {
+		for ( let child of from.getChildren() ) {
 			if ( child instanceof ViewText ) {
 				instance.add( child );
 			} else {
-				instance = ViewConsumable.createFromElement( child, instance );
+				instance = ViewConsumable.createFrom( child, instance );
 			}
 		}
 

+ 4 - 4
packages/ckeditor5-engine/tests/treecontroller/viewconsumable.js

@@ -520,9 +520,9 @@ describe( 'ViewConsumable', () => {
 		} );
 	} );
 
-	describe( 'createFromElement', () => {
+	describe( 'createFrom', () => {
 		it( 'should return new ViewConsumable instance', () => {
-			const newConsumable = ViewConsumable.createFromElement( el );
+			const newConsumable = ViewConsumable.createFrom( el );
 
 			expect( newConsumable ).to.be.instanceof( ViewConsumable );
 			expect( newConsumable.test( el, { name: true } ) ).to.be.true;
@@ -530,7 +530,7 @@ describe( 'ViewConsumable', () => {
 
 		it( 'should return new ViewConsumable instance from document fragment', () => {
 			const fragment = new ViewDocumentFragment();
-			const newConsumable = ViewConsumable.createFromElement( fragment );
+			const newConsumable = ViewConsumable.createFrom( fragment );
 
 			expect( newConsumable ).to.be.instanceof( ViewConsumable );
 			expect( newConsumable.test( fragment ) ).to.be.true;
@@ -544,7 +544,7 @@ describe( 'ViewConsumable', () => {
 			const child3 = new ViewElement( 'p', { 'style': 'top:10px;', 'class': 'qux bar' }, [ text2, child2 ] );
 			el.appendChildren( [ child1, child3 ] );
 
-			const newConsumable = ViewConsumable.createFromElement( el );
+			const newConsumable = ViewConsumable.createFrom( el );
 
 			expect( newConsumable.test( el, { name: true } ) ).to.be.true;
 			expect( newConsumable.test( text1 ) ).to.be.true;