Ticket #4824: 4824.patch

_source/plugins/selection/plugin.js

@@ -459 +459 @@
                                                                 testRange = range.duplicate();
 
                                                                 testRange.moveToElementText( child );
-                                                                testRange.collapse();
 
-                                                                var comparison = testRange.compareEndPoints( 'StartToStart', range );
+                                                                var comparisonStart = testRange.compareEndPoints( 'StartToStart', range ),
+                                                                                comparisonEnd = testRange.compareEndPoints( 'EndToStart', range );
 
-                                                                if ( comparison > 0 )
+                                                                testRange.collapse();
+
+                                                                if ( comparisonStart > 0 )
                                                                         break;
-                                                                else if ( comparison === 0 )
-                                                                        return {
-                                                                                container : parent,
-                                                                                offset : i
-                                                                        };
+                                                                // When selection stay at the side of certain self-closing elements, e.g. BR,
+                                                                // our comparison will never shows an equality. (#4824)
+                                                                else if ( comparisonStart === 0 || comparisonEnd == 1 && comparisonStart == -1 )
+                                                                        return { container : parent, offset : i };
+                                                                else if( comparisonEnd === 0 )
+                                                                        return { container : parent, offset : i + 1 };
 
                                                                 testRange = null;
                                                         }