Merge branch 't/12308'

Author: Reinmar

core/dom/iterator.js

@@ -370,10 +370,12 @@
 			// Because information about line break will be lost when shrinking range.
 			// Note that we test only if path block exist, because we must properly shrink
 			// range containing table and/or table cells.
+			// Note: When range is collapsed there's no way it can be shrinked.
+			// By checking if range is collapsed we also prevent #12308.
 			startPath = range.startPath(),
 			endPath = range.endPath(),
-			startAtInnerBoundary = rangeAtInnerBlockBoundary( range, startPath.block ),
-			endAtInnerBoundary = rangeAtInnerBlockBoundary( range, endPath.block, 1 );
+			startAtInnerBoundary = !range.collapsed && rangeAtInnerBlockBoundary( range, startPath.block ),
+			endAtInnerBoundary = !range.collapsed && rangeAtInnerBlockBoundary( range, endPath.block, 1 );
 
 		// Shrink the range to exclude harmful "noises" (#4087, #4450, #5435).
 		range.shrink( CKEDITOR.SHRINK_ELEMENT, true );

tests/core/dom/iterator.js

@@ -152,6 +152,15 @@ bender.test( {
 		assert.areSame( 'h1,p', iterateWithRangeIterator( ranges ).join( ',' ) );
 	},
 
+	// #12308 (Note: this test wasn't able to verify #12308's patch, but it makes sense anyway).
+	'test iterating at block boundary - before bogus br': function() {
+		if ( !CKEDITOR.env.needsBrFiller )
+			assert.ignore();
+
+		var source = '<h1>para1^<br /></h1><p>para2</p>';
+		checkRangeIteration( source, null,  [ 'h1' ], null, 'Iteration will yield heading.' );
+	},
+
 	'test iterating over pseudo block': function() {
 		var source = '<div><p>[paragraph</p>text]</div>';
 		var output = '<div><p>paragraph</p><p>text</p></div>';