Added more restricted types in setTo().

ckeditor · Jan 26, 2018 · 8cd280c · 8cd280c
1 parent cf28a1f
commit 8cd280c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/src/model/selection.js b/src/model/selection.js
@@ -299,11 +299,11 @@ export default class Selection {
 	 * @param {Boolean|Number|'before'|'end'|'after'} [backwardSelectionOrOffset]
 	 */
 	setTo( selectable, backwardSelectionOrOffset ) {
-		if ( !selectable ) {
+		if ( selectable === null ) {
 			this._setRanges( [] );
 		} else if ( selectable instanceof Selection ) {
 			this._setRanges( selectable.getRanges(), selectable.isBackward );
-		} else if ( selectable._selection && selectable._selection instanceof Selection ) {
+		} else if ( selectable && selectable._selection instanceof Selection ) {
 			// We assume that the selectable is a DocumentSelection.
 			// It can't be imported here, because it would lead to circular imports.
 			this._setRanges( selectable.getRanges(), selectable.isBackward );

diff --git a/src/view/selection.js b/src/view/selection.js
@@ -412,7 +412,7 @@ export default class Selection {
 	 * @param {Boolean|Number|'before'|'end'|'after'} [backwardSelectionOrOffset]
 	 */
 	setTo( selectable, backwardSelectionOrOffset ) {
-		if ( selectable == null ) {
+		if ( selectable === null ) {
 			this._removeAllRanges();
 		} else if ( selectable instanceof Selection ) {
 			this._isFake = selectable.isFake;

diff --git a/tests/model/selection.js b/tests/model/selection.js
@@ -241,6 +241,12 @@ describe( 'Selection', () => {
 			} ).to.throw( /model-selection-setTo-not-selectable/ );
 		} );
 
+		it( 'should throw an error when trying to set selection to not selectable #2', () => {
+			expect( () => {
+				selection.setTo();
+			} ).to.throw( /model-selection-setTo-not-selectable/ );
+		} );
+
 		it( 'should allow setting selection inside an element', () => {
 			const element = new Element( 'p', null, [ new Text( 'foo' ), new Text( 'bar' ) ] );
 

diff --git a/tests/view/selection.js b/tests/view/selection.js
@@ -647,6 +647,14 @@ describe( 'Selection', () => {
 					otherSelection.setTo( {} );
 				} ).to.throw( /view-selection-setTo-not-selectable/ );
 			} );
+
+			it( 'should throw an error when trying to set to not selectable #2', () => {
+				const otherSelection = new Selection();
+
+				expect( () => {
+					otherSelection.setTo();
+				} ).to.throw( /view-selection-setTo-not-selectable/ );
+			} );
 		} );
 
 		describe( 'setting collapsed selection', () => {