浏览代码

Docs and test fixes.

Szymon Kupś 7 年之前
父节点
当前提交
5da553a39f

+ 4 - 4
packages/ckeditor5-engine/src/view/domconverter.js

@@ -104,7 +104,7 @@ export default class DomConverter {
 
 	/**
 	 * Binds given DOM element that represents fake selection to {@link module:engine/view/documentselection~DocumentSelection
-	 * view selection}. View selection copy is stored and can be retrieved by
+	 * document selection}. Document selection copy is stored and can be retrieved by
 	 * {@link module:engine/view/domconverter~DomConverter#fakeSelectionToView} method.
 	 *
 	 * @param {HTMLElement} domElement
@@ -115,11 +115,11 @@ export default class DomConverter {
 	}
 
 	/**
-	 * Returns {@link module:engine/view/documentselection~DocumentSelection view selection} instance corresponding to
+	 * Returns {@link module:engine/view/selection~Selection view selection} instance corresponding to
 	 * given DOM element that represents fake selection. Returns `undefined` if binding to given DOM element does not exists.
 	 *
 	 * @param {HTMLElement} domElement
-	 * @returns {module:engine/view/documentselection~DocumentSelection|undefined}
+	 * @returns {module:engine/view/selection~Selection|undefined}
 	 */
 	fakeSelectionToView( domElement ) {
 		return this._fakeSelectionMapping.get( domElement );
@@ -450,7 +450,7 @@ export default class DomConverter {
 	}
 
 	/**
-	 * Converts DOM selection to view {@link module:engine/view/documentselection~DocumentSelection}.
+	 * Converts DOM selection to view {@link module:engine/view/selection~Selection}.
 	 * Ranges which cannot be converted will be omitted.
 	 *
 	 * @param {Selection} domSelection DOM selection.

+ 7 - 5
packages/ckeditor5-engine/src/view/writer.js

@@ -36,9 +36,10 @@ export default class Writer {
 
 	/**
 	 * Sets {@link module:engine/view/documentselection~DocumentSelection selection's} ranges and direction to the
-	 * specified location based on the given {@link module:engine/view/documentselection~DocumentSelection selection},
-	 * {@link module:engine/view/position~Position position}, {@link module:engine/view/item~Item item},
-	 * {@link module:engine/view/range~Range range}, an iterable of {@link module:engine/view/range~Range ranges} or null.
+	 * specified location based on the given {@link module:engine/view/documentselection~DocumentSelection document selection},
+	 * {@link module:engine/view/selection~Selection selection}, {@link module:engine/view/position~Position position},
+	 * {@link module:engine/view/item~Item item}, {@link module:engine/view/range~Range range},
+	 * an iterable of {@link module:engine/view/range~Range ranges} or null.
 	 *
 	 * ### Usage:
 	 *
@@ -92,8 +93,9 @@ export default class Writer {
 	 * 		// (and be  properly handled by screen readers).
 	 *		writer.setSelection( range, { fake: true, label: 'foo' } );
 	 *
-	 * @param {module:engine/view/documentselection~DocumentSelection|module:engine/view/position~Position|
-	 * Iterable.<module:engine/view/range~Range>|module:engine/view/range~Range|module:engine/view/item~Item|null} selectable
+	 * @param {module:engine/view/selection~Selection|module:engine/view/documentselection~DocumentSelection|
+	 * module:engine/view/position~Position|Iterable.<module:engine/view/range~Range>|module:engine/view/range~Range|
+	 * module:engine/view/item~Item|null} selectable
 	 * @param {Number|'before'|'end'|'after'|'on'|'in'} [placeOrOffset] Sets place or offset of the selection.
 	 * @param {Object} [options]
 	 * @param {Boolean} [options.backward] Sets this selection instance to be backward.

+ 6 - 6
packages/ckeditor5-engine/tests/conversion/upcast-selection-converters.js

@@ -4,7 +4,7 @@
  */
 
 import View from '../../src/view/view';
-import ViewDocumentSelection from '../../src/view/selection';
+import ViewSelection from '../../src/view/selection';
 import ViewRange from '../../src/view/range';
 import createViewRoot from '../view/_utils/createroot';
 
@@ -45,7 +45,7 @@ describe( 'convertSelectionChange', () => {
 	} );
 
 	it( 'should convert collapsed selection', () => {
-		const viewSelection = new ViewDocumentSelection();
+		const viewSelection = new ViewSelection();
 		viewSelection.setTo( ViewRange.createFromParentsAndOffsets(
 			viewRoot.getChild( 0 ).getChild( 0 ), 1, viewRoot.getChild( 0 ).getChild( 0 ), 1 ) );
 
@@ -62,7 +62,7 @@ describe( 'convertSelectionChange', () => {
 		// Re-bind elements that were just re-set.
 		mapper.bindElements( modelRoot.getChild( 0 ), viewRoot.getChild( 0 ) );
 
-		const viewSelection = new ViewDocumentSelection( [
+		const viewSelection = new ViewSelection( [
 			ViewRange.createFromParentsAndOffsets( viewRoot.getChild( 0 ).getChild( 0 ), 2, viewRoot.getChild( 0 ).getChild( 0 ), 6 )
 		] );
 
@@ -72,7 +72,7 @@ describe( 'convertSelectionChange', () => {
 	} );
 
 	it( 'should convert multi ranges selection', () => {
-		const viewSelection = new ViewDocumentSelection( [
+		const viewSelection = new ViewSelection( [
 			ViewRange.createFromParentsAndOffsets(
 				viewRoot.getChild( 0 ).getChild( 0 ), 1, viewRoot.getChild( 0 ).getChild( 0 ), 2 ),
 			ViewRange.createFromParentsAndOffsets(
@@ -99,7 +99,7 @@ describe( 'convertSelectionChange', () => {
 	} );
 
 	it( 'should convert reverse selection', () => {
-		const viewSelection = new ViewDocumentSelection( [
+		const viewSelection = new ViewSelection( [
 			ViewRange.createFromParentsAndOffsets(
 				viewRoot.getChild( 0 ).getChild( 0 ), 1, viewRoot.getChild( 0 ).getChild( 0 ), 2 ),
 			ViewRange.createFromParentsAndOffsets(
@@ -113,7 +113,7 @@ describe( 'convertSelectionChange', () => {
 	} );
 
 	it( 'should not enqueue changes if selection has not changed', () => {
-		const viewSelection = new ViewDocumentSelection( [
+		const viewSelection = new ViewSelection( [
 			ViewRange.createFromParentsAndOffsets(
 				viewRoot.getChild( 0 ).getChild( 0 ), 1, viewRoot.getChild( 0 ).getChild( 0 ), 1 )
 		] );