Browse Source

Moved treeModel.Composer tests to correct directory, some docs changes, lint error fix.

Szymon Cofalik 9 years ago
parent
commit
ddc1a34239

+ 1 - 5
packages/ckeditor5-engine/src/treemodel/composer/modifyselection.js

@@ -21,11 +21,7 @@ import Range from '../range.js';
  * @param {Object} [options]
  * @param {'FORWARD'|'BACKWARD'} [options.direction='FORWARD'] The direction in which the selection should be modified.
  */
-export default function modifySelection( selection, options ) {
-	if ( !options ) {
-		options = {};
-	}
-
+export default function modifySelection( selection, options = {} ) {
 	const isForward = options.direction != 'BACKWARD';
 
 	const focus = selection.focus;

+ 4 - 3
packages/ckeditor5-engine/src/treemodel/position.js

@@ -430,6 +430,7 @@ export default class Position {
 	 * * {@link engine.treeModel.Position.createBefore},
 	 * * {@link engine.treeModel.Position.createAfter},
 	 * * {@link engine.treeModel.Position.createFromParentAndOffset},
+	 * * {@link engine.treeModel.Position.createFromPosition}.
 	 *
 	 * @param {engine.treeModel.Node|engine.treeModel.Position} nodeOrPosition
 	 * @param {Number|'END'|'BEFORE'|'AFTER'} [offset=0] Offset or one of the flags. Used only when
@@ -512,11 +513,11 @@ export default class Position {
 	static createFromParentAndOffset( parent, offset ) {
 		if ( !( parent instanceof Element || parent instanceof DocumentFragment ) ) {
 			/**
-			 * Position must be anchored in an element.
+			 * Position parent have to be a model element or model document fragment.
 			 *
-			 * @error position-in-text
+			 * @error position-parent-incorrect
 			 */
-			throw new CKEditorError( 'position-in-text: Position cannot be in located inside a text node.' );
+			throw new CKEditorError( 'position-parent-incorrect: Position parent have to be a model element or model document fragment.' );
 		}
 
 		const path = parent.getPath();

+ 0 - 1
packages/ckeditor5-engine/tests/treecontroller/advanced-converters.js

@@ -16,7 +16,6 @@ import ModelRange from '/ckeditor5/engine/treemodel/range.js';
 import ModelPosition from '/ckeditor5/engine/treemodel/position.js';
 import ModelWalker from '/ckeditor5/engine/treemodel/treewalker.js';
 
-import ViewDocumentFragment from '/ckeditor5/engine/treeview/documentfragment.js';
 import ViewElement from '/ckeditor5/engine/treeview/element.js';
 import ViewContainerElement from '/ckeditor5/engine/treeview/containerelement.js';
 import ViewAttributeElement from '/ckeditor5/engine/treeview/attributeelement.js';

+ 2 - 0
packages/ckeditor5-engine/tests/composer/composer.js

@@ -3,6 +3,8 @@
  * For licensing, see LICENSE.md.
  */
 
+/* bender-tags: treemodel, composer */
+
 'use strict';
 
 import Document from '/ckeditor5/engine/treemodel/document.js';

+ 2 - 0
packages/ckeditor5-engine/tests/composer/deletecontents.js

@@ -3,6 +3,8 @@
  * For licensing, see LICENSE.md.
  */
 
+/* bender-tags: treemodel, composer */
+
 'use strict';
 
 import Document from '/ckeditor5/engine/treemodel/document.js';

+ 2 - 0
packages/ckeditor5-engine/tests/composer/modifyselection.js

@@ -3,6 +3,8 @@
  * For licensing, see LICENSE.md.
  */
 
+/* bender-tags: treemodel, composer */
+
 'use strict';
 
 import Document from '/ckeditor5/engine/treemodel/document.js';

+ 1 - 1
packages/ckeditor5-engine/tests/treemodel/position.js

@@ -111,7 +111,7 @@ describe( 'position', () => {
 		it( 'throws when parent is not an element', () => {
 			expect( () => {
 				Position.createFromParentAndOffset( b, 0 );
-			} ).to.throw( CKEditorError, /^position-in-text:/ );
+			} ).to.throw( CKEditorError, /^position-parent-incorrect/ );
 		} );
 
 		it( 'works with a doc frag', () => {