Bladeren bron

Renamed `END` to lower case.

Oskar Wrobel 9 jaren geleden
bovenliggende
commit
5faad92674

+ 2 - 2
packages/ckeditor5-engine/src/model/composer/modifyselection.js

@@ -72,13 +72,13 @@ export default function modifySelection( selection, options = {} ) {
 	}
 	// 4.3. OK, we're entering a new element. So let's place there the focus.
 	else {
-		selection.setFocus( value.item, isForward ? 0 : 'END' );
+		selection.setFocus( value.item, isForward ? 0 : 'end' );
 	}
 }
 
 function getSearchRange( start, isForward ) {
 	const root = start.root;
-	const searchEnd = Position.createAt( root, isForward ? 'END' : 0 );
+	const searchEnd = Position.createAt( root, isForward ? 'end' : 0 );
 
 	if ( isForward ) {
 		return new Range( start, searchEnd );

+ 3 - 3
packages/ckeditor5-engine/src/model/position.js

@@ -448,7 +448,7 @@ export default class Position {
 	 *
 	 * * a {@link engine.model.Position position},
 	 * * parent element and offset (offset defaults to `0`),
-	 * * parent element and `'END'` (sets selection at the end of that element),
+	 * * parent element and `'end'` (sets selection at the end of that element),
 	 * * node and `'before'` or `'after'` (sets selection before or after the given node).
 	 *
 	 * This method is a shortcut to other constructors such as:
@@ -459,7 +459,7 @@ export default class Position {
 	 * * {@link engine.model.Position.createFromPosition}.
 	 *
 	 * @param {engine.model.Node|engine.model.Position} nodeOrPosition
-	 * @param {Number|'END'|'before'|'after'} [offset=0] Offset or one of the flags. Used only when
+	 * @param {Number|'end'|'before'|'after'} [offset=0] Offset or one of the flags. Used only when
 	 * first parameter is a node.
 	 */
 	static createAt( nodeOrPosition, offset ) {
@@ -470,7 +470,7 @@ export default class Position {
 		} else {
 			node = nodeOrPosition;
 
-			if ( offset == 'END' ) {
+			if ( offset == 'end' ) {
 				offset = node.getChildCount();
 			} else if ( offset == 'before' ) {
 				return this.createBefore( node );

+ 2 - 2
packages/ckeditor5-engine/src/model/selection.js

@@ -306,7 +306,7 @@ export default class Selection {
 	 *
 	 * @fires engine.model.Selection#change:range
 	 * @param {engine.model.Node|engine.model.Position} nodeOrPosition
-	 * @param {Number|'END'|'before'|'after'} [offset=0] Offset or one of the flags. Used only when
+	 * @param {Number|'end'|'before'|'after'} [offset=0] Offset or one of the flags. Used only when
 	 * first parameter is a node.
 	 */
 	collapse( nodeOrPosition, offset ) {
@@ -323,7 +323,7 @@ export default class Selection {
 	 *
 	 * @fires engine.model.Selection#change:range
 	 * @param {engine.model.Node|engine.model.Position} nodeOrPosition
-	 * @param {Number|'END'|'before'|'after'} [offset=0] Offset or one of the flags. Used only when
+	 * @param {Number|'end'|'before'|'after'} [offset=0] Offset or one of the flags. Used only when
 	 * first parameter is a node.
 	 */
 	setFocus( nodeOrPosition, offset ) {

+ 1 - 1
packages/ckeditor5-engine/tests/_utils-tests/model.js

@@ -214,7 +214,7 @@ describe( 'model test utils', () => {
 			} );
 
 			it( 'writes selection collapsed at the end of the root', () => {
-				selection.collapse( root, 'END' );
+				selection.collapse( root, 'end' );
 
 				// Needed due to https://github.com/ckeditor/ckeditor5-engine/issues/320.
 				selection.clearAttributes();

+ 1 - 1
packages/ckeditor5-engine/tests/_utils/model.js

@@ -195,7 +195,7 @@ export function parse( data, options = {} ) {
 
 		collapsedSelection( token ) {
 			withSelection = true;
-			selection.collapse( root, 'END' );
+			selection.collapse( root, 'end' );
 			selection.setAttributesTo( token.attributes );
 		},
 

+ 1 - 1
packages/ckeditor5-engine/tests/model/liveselection.js

@@ -167,7 +167,7 @@ describe( 'LiveSelection', () => {
 	describe( 'setFocus', () => {
 		it( 'modifies default range', () => {
 			const startPos = selection.getFirstPosition();
-			const endPos = Position.createAt( root, 'END' );
+			const endPos = Position.createAt( root, 'end' );
 
 			selection.setFocus( endPos );
 

+ 2 - 2
packages/ckeditor5-engine/tests/model/position.js

@@ -164,7 +164,7 @@ describe( 'position', () => {
 		} );
 
 		it( 'should create positions from node and flag', () => {
-			expect( Position.createAt( root, 'END' ) ).to.have.property( 'path' ).that.deep.equals( [ 2 ] );
+			expect( Position.createAt( root, 'end' ) ).to.have.property( 'path' ).that.deep.equals( [ 2 ] );
 
 			expect( Position.createAt( p, 'before' ) ).to.have.property( 'path' ).that.deep.equals( [ 0 ] );
 			expect( Position.createAt( a, 'before' ) ).to.have.property( 'path' ).that.deep.equals( [ 1, 1, 1 ] );
@@ -172,7 +172,7 @@ describe( 'position', () => {
 			expect( Position.createAt( p, 'after' ) ).to.have.property( 'path' ).that.deep.equals( [ 1 ] );
 			expect( Position.createAt( a, 'after' ) ).to.have.property( 'path' ).that.deep.equals( [ 1, 1, 2 ] );
 
-			expect( Position.createAt( ul, 'END' ) ).to.have.property( 'path' ).that.deep.equals( [ 1, 2 ] );
+			expect( Position.createAt( ul, 'end' ) ).to.have.property( 'path' ).that.deep.equals( [ 1, 2 ] );
 		} );
 	} );
 

+ 4 - 4
packages/ckeditor5-engine/tests/model/selection.js

@@ -206,7 +206,7 @@ describe( 'Selection', () => {
 		} );
 
 		it( 'sets selection at the end of the given parent', () => {
-			selection.collapse( root, 'END' );
+			selection.collapse( root, 'end' );
 
 			expect( selection ).to.have.property( 'isCollapsed', true );
 
@@ -296,13 +296,13 @@ describe( 'Selection', () => {
 			const spy = sinon.spy();
 			selection.on( 'change:range', spy );
 
-			selection.setFocus( Position.createAt( root, 'END' ) );
+			selection.setFocus( Position.createAt( root, 'end' ) );
 
 			expect( spy.calledOnce ).to.be.true;
 		} );
 
 		it( 'throws if there are no ranges in selection', () => {
-			const endPos = Position.createAt( root, 'END' );
+			const endPos = Position.createAt( root, 'end' );
 
 			expect( () => {
 				selection.setFocus( endPos );
@@ -440,7 +440,7 @@ describe( 'Selection', () => {
 
 			selection.addRange( new Range( startPos, endPos ) );
 
-			selection.setFocus( root, 'END' );
+			selection.setFocus( root, 'end' );
 
 			expect( spy.calledOnce ).to.be.true;
 			expect( selection.focus.compareWith( newEndPos ) ).to.equal( 'SAME' );