Changed: implementation of view/model.Selection#isEqual.

ckeditor · Nov 16, 2016 · 9a10e12 · 9a10e12
1 parent b1e0e1f
commit 9a10e12
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 16 deletions.
diff --git a/src/model/selection.js b/src/model/selection.js
@@ -142,14 +142,25 @@ export default class Selection {
 			return false;
 		}
 
-		// Every range from this selection...
-		return Array.from( this.getRanges() ).every( ( rangeA ) => {
-			// ... has a range in other selection...
-			return Array.from( otherSelection.getRanges() ).some( ( rangeB ) => {
-				// ... which it is equal to.
-				return rangeA.isEqual( rangeB );
-			} );
-		} );
+		const thisRanges = Array.from( this.getRanges() );
+		const otherRanges = Array.from( otherSelection.getRanges() );
+
+		for ( let thisRange of thisRanges ) {
+			let found = false;
+
+			for ( let otherRange of otherRanges ) {
+				if ( thisRange.isEqual( otherRange ) ) {
+					found = true;
+					break;
+				}
+			}
+
+			if ( !found ) {
+				return false;
+			}
+		}
+
+		return true;
 	}
 
 	/**

diff --git a/src/view/selection.js b/src/view/selection.js
@@ -308,14 +308,25 @@ export default class Selection {
 			return false;
 		}
 
-		// Every range from this selection...
-		return Array.from( this.getRanges() ).every( ( rangeA ) => {
-			// ... has a range in other selection...
-			return Array.from( otherSelection.getRanges() ).some( ( rangeB ) => {
-				// ... which it is equal to.
-				return rangeA.isEqual( rangeB );
-			} );
-		} );
+		const thisRanges = Array.from( this.getRanges() );
+		const otherRanges = Array.from( otherSelection.getRanges() );
+
+		for ( let thisRange of thisRanges ) {
+			let found = false;
+
+			for ( let otherRange of otherRanges ) {
+				if ( thisRange.isEqual( otherRange ) ) {
+					found = true;
+					break;
+				}
+			}
+
+			if ( !found ) {
+				return false;
+			}
+		}
+
+		return true;
 	}
 
 	/**