Ticket #4621: 4621.patch

_source/core/dom/range.js

@@ -1183 +1183 @@
                                         this.setStartAt(
                                                         blockBoundary,
                                                         !blockBoundary.is( 'br' ) &&
-                                                        ( !enlargeable || blockBoundary.contains( enlargeable ) ) ?
+                                                        ( !enlargeable && this.checkStartOfBlock()
+                                                          || enlargeable && blockBoundary.contains( enlargeable ) ) ?
                                                                 CKEDITOR.POSITION_AFTER_START :
                                                                 CKEDITOR.POSITION_AFTER_END );
 
@@ -1208 +1209 @@
                                         // the document position of it with 'enlargeable' node.
                                         this.setEndAt(
                                                         blockBoundary,
-                                                        !blockBoundary.is( 'br' ) &&
-                                                        ( !enlargeable || blockBoundary.contains( enlargeable ) ) ?
+                                                        ( !enlargeable && this.checkEndOfBlock()
+                                                          || enlargeable && blockBoundary.contains( enlargeable ) ) ?
                                                                 CKEDITOR.POSITION_BEFORE_END :
                                                                 CKEDITOR.POSITION_BEFORE_START );
                                         // We must include the <br> at the end of range if there's