Merge pull request #1276 from ckeditor/t/1275

Fix: `Schema#getLimitElement()` will return a proper limit element (the root element) if one of the selection's ranges have the root element as the limit element. Closes #1275.

Author: Reinmar

src/model/schema.js

@@ -581,12 +581,14 @@ export default class Schema {
 	getLimitElement( selection ) {
 		// Find the common ancestor for all selection's ranges.
 		let element = Array.from( selection.getRanges() )
-			.reduce( ( node, range ) => {
-				if ( !node ) {
-					return range.getCommonAncestor();
+			.reduce( ( element, range ) => {
+				const rangeCommonAncestor = range.getCommonAncestor();
+
+				if ( !element ) {
+					return rangeCommonAncestor;
 				}
 
-				return node.getCommonAncestor( range.getCommonAncestor() );
+				return element.getCommonAncestor( rangeCommonAncestor, { includeSelf: true } );
 			}, null );
 
 		while ( !this.isLimit( element ) ) {

tests/model/schema.js

@@ -933,6 +933,38 @@ describe( 'Schema', () => {
 
 			expect( schema.getLimitElement( doc.selection ) ).to.equal( root );
 		} );
+
+		it( 'works fine with multi-range selections if the first range has the root element as a limit element', () => {
+			setData(
+				model,
+				'<image>' +
+					'<caption>[Foo</caption>' +
+				'</image>' +
+				'<article>' +
+					'<paragraph>Paragraph in article]</paragraph>' +
+				'</article>' +
+				'<paragraph>Paragraph item 1</paragraph>' +
+				'<paragraph>Paragraph [item 2]</paragraph>'
+			);
+
+			expect( schema.getLimitElement( doc.selection ) ).to.equal( root );
+		} );
+
+		it( 'works fine with multi-range selections if the last range has the root element as a limit element', () => {
+			setData(
+				model,
+				'<paragraph>Paragraph item 1</paragraph>' +
+				'<paragraph>Paragraph [item 2]</paragraph>' +
+				'<image>' +
+					'<caption>[Foo</caption>' +
+				'</image>' +
+				'<article>' +
+					'<paragraph>Paragraph in article]</paragraph>' +
+				'</article>'
+			);
+
+			expect( schema.getLimitElement( doc.selection ) ).to.equal( root );
+		} );
 	} );
 
 	describe( 'checkAttributeInSelection()', () => {