Browse Source

Renamed getBlockFillerOffset to getFillerOffset.

Piotr Jasiun 9 years ago
parent
commit
8370b702a2

+ 1 - 1
packages/ckeditor5-engine/src/treeview/attributeelement.js

@@ -78,7 +78,7 @@ export default class AttributeElement extends Element {
 	 *
 	 * @returns {Number|false} Block filler offset or null if block filler is not needed.
 	 */
-	getBlockFillerOffset() {
+	getFillerOffset() {
 		// <b>foo</b> does not need filler
 		if ( this.getChildCount() ) {
 			return null;

+ 1 - 1
packages/ckeditor5-engine/src/treeview/containerelement.js

@@ -57,7 +57,7 @@ export default class ContainerElement extends Element {
 	 *
 	 * @returns {Number|false} Block filler offset or null if block filler is not needed.
 	 */
-	getBlockFillerOffset() {
+	getFillerOffset() {
 		return this.getChildCount() === 0 ? 0 : null;
 	}
 }

+ 1 - 1
packages/ckeditor5-engine/src/treeview/domconverter.js

@@ -147,7 +147,7 @@ export default class DomConverter {
 	}
 
 	*viewChildrenToDom( viewElement, domDocument, options = {} ) {
-		let fillerPositionOffset = viewElement.getBlockFillerOffset && viewElement.getBlockFillerOffset();
+		let fillerPositionOffset = viewElement.getFillerOffset && viewElement.getFillerOffset();
 		let offset = 0;
 
 		for ( let childView of viewElement.getChildren() ) {

+ 1 - 1
packages/ckeditor5-engine/src/treeview/renderer.js

@@ -234,7 +234,7 @@ export default class Renderer {
 		}
 
 		// We have block filler, we do not need inline one.
-		if ( selectionOffset === selectionParent.getBlockFillerOffset() ) {
+		if ( selectionOffset === selectionParent.getFillerOffset() ) {
 			return false;
 		}
 

+ 7 - 7
packages/ckeditor5-engine/tests/treeview/attributeelement.js

@@ -58,12 +58,12 @@ describe( 'AttributeElement', () => {
 		} );
 	} );
 
-	describe( 'getBlockFillerOffset', () => {
+	describe( 'getFillerOffset', () => {
 		it( 'should return position 0 if it is the only element in the container', () => {
 			const { selection } = parse( '<container:p><attribute:b>[]</attribute:b></container:p>' );
 			const attribute = selection.getFirstPosition().parent;
 
-			expect( attribute.getBlockFillerOffset() ).to.equals( 0 );
+			expect( attribute.getFillerOffset() ).to.equals( 0 );
 		} );
 
 		it( 'should return position 0 if it is the only nested element in the container', () => {
@@ -71,26 +71,26 @@ describe( 'AttributeElement', () => {
 				'<container:p><attribute:b><attribute:i>[]</attribute:i></attribute:b></container:p>' );
 			const attribute = selection.getFirstPosition().parent;
 
-			expect( attribute.getBlockFillerOffset() ).to.equals( 0 );
+			expect( attribute.getFillerOffset() ).to.equals( 0 );
 		} );
 
 		it( 'should return null if element contains another element', () => {
 			const attribute = parse( '<attribute:b><attribute:i></attribute:i></attribute:b>' );
 
-			expect( attribute.getBlockFillerOffset() ).to.be.null;
+			expect( attribute.getFillerOffset() ).to.be.null;
 		} );
 
 		it( 'should return null if element contains text', () => {
 			const attribute = parse( '<attribute:b>text</attribute:b>' );
 
-			expect( attribute.getBlockFillerOffset() ).to.be.null;
+			expect( attribute.getFillerOffset() ).to.be.null;
 		} );
 
 		it( 'should return null if container element contains text', () => {
 			const { selection } = parse( '<container:p><attribute:b>[]</attribute:b>foo</container:p>' );
 			const attribute = selection.getFirstPosition().parent;
 
-			expect( attribute.getBlockFillerOffset() ).to.be.null;
+			expect( attribute.getFillerOffset() ).to.be.null;
 		} );
 
 		it( 'should return null if it is the parent contains text', () => {
@@ -98,7 +98,7 @@ describe( 'AttributeElement', () => {
 				'<container:p><attribute:b><attribute:i>[]</attribute:i>foo</attribute:b></container:p>' );
 			const attribute = selection.getFirstPosition().parent;
 
-			expect( attribute.getBlockFillerOffset() ).to.be.null;
+			expect( attribute.getFillerOffset() ).to.be.null;
 		} );
 	} );
 } );

+ 3 - 3
packages/ckeditor5-engine/tests/treeview/containerelement.js

@@ -22,13 +22,13 @@ describe( 'ContainerElement', () => {
 		} );
 	} );
 
-	describe( 'getBlockFillerOffset', () => {
+	describe( 'getFillerOffset', () => {
 		it( 'should return position 0 if element is empty', () => {
-			expect( parse( '<container:p></container:p>' ).getBlockFillerOffset() ).to.equals( 0 );
+			expect( parse( '<container:p></container:p>' ).getFillerOffset() ).to.equals( 0 );
 		} );
 
 		it( 'should return null if element is not empty', () => {
-			expect( parse( '<container:p>foo</container:p>' ).getBlockFillerOffset() ).to.be.null;
+			expect( parse( '<container:p>foo</container:p>' ).getFillerOffset() ).to.be.null;
 		} );
 	} );
 } );

+ 1 - 1
packages/ckeditor5-engine/tests/treeview/domconverter/view-to-dom.js

@@ -181,7 +181,7 @@ describe( 'DomConverter', () => {
 
 		it( 'should add filler according to fillerPositionOffset', () => {
 			const viewP = parse( '<container:p>foo</container:p>' );
-			viewP.getBlockFillerOffset = () => 0;
+			viewP.getFillerOffset = () => 0;
 
 			const domChildren = Array.from( converter.viewChildrenToDom( viewP, document ) );