8
0
Maciej Bukowski 8 лет назад
Родитель
Сommit
c52f131675

+ 7 - 7
packages/ckeditor5-engine/src/model/documentselection.js

@@ -252,7 +252,7 @@ export default class DocumentSelection {
 	 *
 	 *
 	 * The location can be specified in the same form as {@link module:engine/model/position~Position.createAt} parameters.
 	 * The location can be specified in the same form as {@link module:engine/model/position~Position.createAt} parameters.
 	 *
 	 *
-	 * @see {module:engine/model/writer~Writer#setSelectionFocus}
+	 * @see module:engine/model/writer~Writer#setSelectionFocus
 	 * @protected
 	 * @protected
 	 * @param {module:engine/model/item~Item|module:engine/model/position~Position} itemOrPosition
 	 * @param {module:engine/model/item~Item|module:engine/model/position~Position} itemOrPosition
 	 * @param {Number|'end'|'before'|'after'} [offset] Offset or one of the flags. Used only when
 	 * @param {Number|'end'|'before'|'after'} [offset] Offset or one of the flags. Used only when
@@ -269,9 +269,9 @@ export default class DocumentSelection {
 	 * {@link module:engine/model/range~Range range}, an iterable of {@link module:engine/model/range~Range ranges} or null.
 	 * {@link module:engine/model/range~Range range}, an iterable of {@link module:engine/model/range~Range ranges} or null.
 	 * Should be used only within the {@link module:engine/model/writer~Writer#setSelection} method.
 	 * Should be used only within the {@link module:engine/model/writer~Writer#setSelection} method.
 	 *
 	 *
-	 * @see {module:engine/model/writer~Writer#setTo}
+	 * @see module:engine/model/writer~Writer#setSelection
 	 * @protected
 	 * @protected
-	 * @param {module:engine/model/selection~Selection|module:engine/model/selection~DocumentSelection|
+	 * @param {module:engine/model/selection~Selection|module:engine/model/documentselection~DocumentSelection|
 	 * module:engine/model/position~Position|module:engine/model/element~Element|
 	 * module:engine/model/position~Position|module:engine/model/element~Element|
 	 * Iterable.<module:engine/model/range~Range>|module:engine/model/range~Range|null} selectable
 	 * Iterable.<module:engine/model/range~Range>|module:engine/model/range~Range|null} selectable
 	 * @param {Boolean|Number|'before'|'end'|'after'} [backwardSelectionOrOffset]
 	 * @param {Boolean|Number|'before'|'end'|'after'} [backwardSelectionOrOffset]
@@ -327,7 +327,7 @@ export default class DocumentSelection {
 	 * Sets attribute on the selection. If attribute with the same key already is set, it's value is overwritten.
 	 * Sets attribute on the selection. If attribute with the same key already is set, it's value is overwritten.
 	 * Should be used only within the {@link module:engine/model/writer~Writer#setSelectionAttribute} method.
 	 * Should be used only within the {@link module:engine/model/writer~Writer#setSelectionAttribute} method.
 	 *
 	 *
-	 * @see {module:engine/model/writer~Writer#setSelectionAttribute}
+	 * @see module:engine/model/writer~Writer#setSelectionAttribute
 	 * @protected
 	 * @protected
 	 * @param {String} key Key of the attribute to set.
 	 * @param {String} key Key of the attribute to set.
 	 * @param {*} value Attribute value.
 	 * @param {*} value Attribute value.
@@ -338,11 +338,11 @@ export default class DocumentSelection {
 
 
 	/**
 	/**
 	 * Removes an attribute with given key from the selection.
 	 * Removes an attribute with given key from the selection.
-	 * If the given attribute was set on the selection, fires the {@link #event:change} event with
-	 * removed attribute key.
+	 * If the given attribute was set on the selection, fires the {@link module:engine/model/liveselection~LiveSelection#event:change}
+	 * event with removed attribute key.
 	 * Should be used only within the {@link module:engine/model/writer~Writer#removeSelectionAttribute} method.
 	 * Should be used only within the {@link module:engine/model/writer~Writer#removeSelectionAttribute} method.
 	 *
 	 *
-	 * @see {module:engine/model/writer~Writer#removeSelectionAttribute}
+	 * @see module:engine/model/writer~Writer#removeSelectionAttribute
 	 * @protected
 	 * @protected
 	 * @param {String} key Key of the attribute to remove.
 	 * @param {String} key Key of the attribute to remove.
 	 */
 	 */

+ 4 - 2
packages/ckeditor5-engine/src/model/liveselection.js

@@ -200,7 +200,7 @@ export default class LiveSelection extends Selection {
 	 */
 	 */
 	setTo( selectable, backwardSelectionOrOffset ) {
 	setTo( selectable, backwardSelectionOrOffset ) {
 		super.setTo( selectable, backwardSelectionOrOffset );
 		super.setTo( selectable, backwardSelectionOrOffset );
-		this.refreshAttributes();
+		this._refreshAttributes();
 	}
 	}
 
 
 	/**
 	/**
@@ -263,8 +263,10 @@ export default class LiveSelection extends Selection {
 
 
 	/**
 	/**
 	 * Removes all attributes from the selection and sets attributes according to the surrounding nodes.
 	 * Removes all attributes from the selection and sets attributes according to the surrounding nodes.
+	 *
+	 * @protected
 	 */
 	 */
-	refreshAttributes() {
+	_refreshAttributes() {
 		this._updateAttributes( true );
 		this._updateAttributes( true );
 	}
 	}
 
 

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

@@ -296,7 +296,7 @@ export default class Selection {
 	 * 		// Removes all ranges.
 	 * 		// Removes all ranges.
 	 *		selection.setTo( null );
 	 *		selection.setTo( null );
 	 *
 	 *
-	 * @param {module:engine/model/selection~Selection|module:engine/model/selection~DocumentSelection|
+	 * @param {module:engine/model/selection~Selection|module:engine/model/documentselection~DocumentSelection|
 	 * module:engine/model/position~Position|module:engine/model/element~Element|
 	 * module:engine/model/position~Position|module:engine/model/element~Element|
 	 * Iterable.<module:engine/model/range~Range>|module:engine/model/range~Range|null} selectable
 	 * Iterable.<module:engine/model/range~Range>|module:engine/model/range~Range|null} selectable
 	 * @param {Boolean|Number|'before'|'end'|'after'} [backwardSelectionOrOffset]
 	 * @param {Boolean|Number|'before'|'end'|'after'} [backwardSelectionOrOffset]

+ 1 - 4
packages/ckeditor5-engine/src/model/writer.js

@@ -824,7 +824,7 @@ export default class Writer {
 	 * 		// Removes all ranges.
 	 * 		// Removes all ranges.
 	 *		selection.setTo( null );
 	 *		selection.setTo( null );
 	 *
 	 *
-	 * @param {module:engine/model/selection~Selection|module:engine/model/selection~DocumentSelection|
+	 * @param {module:engine/model/selection~Selection|module:engine/model/documentselection~DocumentSelection|
 	 * module:engine/model/position~Position|module:engine/model/element~Element|
 	 * module:engine/model/position~Position|module:engine/model/element~Element|
 	 * Iterable.<module:engine/model/range~Range>|module:engine/model/range~Range|null} selectable
 	 * Iterable.<module:engine/model/range~Range>|module:engine/model/range~Range|null} selectable
 	 * @param {Boolean|Number|'before'|'end'|'after'} [backwardSelectionOrOffset]
 	 * @param {Boolean|Number|'before'|'end'|'after'} [backwardSelectionOrOffset]
@@ -865,9 +865,6 @@ export default class Writer {
 	/**
 	/**
 	 * Removes an attribute with given key from the selection.
 	 * Removes an attribute with given key from the selection.
 	 *
 	 *
-	 * If the given attribute was set on the selection, fires the {@link #event:change} event with
-	 * removed attribute key.
-	 *
 	 * @param {String} key Key of the attribute to remove.
 	 * @param {String} key Key of the attribute to remove.
 	 */
 	 */
 	removeSelectionAttribute( key ) {
 	removeSelectionAttribute( key ) {

+ 4 - 5
packages/ckeditor5-engine/src/view/selection.js

@@ -20,10 +20,9 @@ import isIterable from '@ckeditor/ckeditor5-utils/src/isiterable';
 /**
 /**
  * Class representing selection in tree view.
  * Class representing selection in tree view.
  *
  *
- * Selection can consist of {@link module:engine/view/range~Range ranges} that can be added using
- * {@link module:engine/view/selection~Selection#addRange addRange}
- * and {@link module:engine/view/selection~Selection#setRanges setRanges} methods.
- * Both methods create copies of provided ranges and store those copies internally. Further modifications to passed
+ * Selection can consist of {@link module:engine/view/range~Range ranges} that can be set using
+ * {@link module:engine/view/selection~Selection#setTo} method.
+ * That method create copies of provided ranges and store those copies internally. Further modifications to passed
  * ranges will not change selection's state.
  * ranges will not change selection's state.
  * Selection's ranges can be obtained via {@link module:engine/view/selection~Selection#getRanges getRanges},
  * Selection's ranges can be obtained via {@link module:engine/view/selection~Selection#getRanges getRanges},
  * {@link module:engine/view/selection~Selection#getFirstRange getFirstRange}
  * {@link module:engine/view/selection~Selection#getFirstRange getFirstRange}
@@ -440,7 +439,7 @@ export default class Selection {
 	/**
 	/**
 	 * Replaces all ranges that were added to the selection with given array of ranges. Last range of the array
 	 * Replaces all ranges that were added to the selection with given array of ranges. Last range of the array
 	 * is treated like the last added range and is used to set {@link #anchor anchor} and {@link #focus focus}.
 	 * is treated like the last added range and is used to set {@link #anchor anchor} and {@link #focus focus}.
-	 * Accepts a flag describing in which way the selection is made (see {@link #addRange addRange}).
+	 * Accepts a flag describing in which way the selection is made.
 	 *
 	 *
 	 * @protected
 	 * @protected
 	 * @fires change
 	 * @fires change