Ticket #7645: 7645.patch

_source/core/dom/range.js

@@ -2007 +2007 @@
                                 return container ;
 
                         return container.getChild( this.endOffset - 1 ) || container ;
-                }
+                },
+
+                // Fix list selection range where entire range is selected from the inner side.
+                // <ul><li>[...]</li></ul> =>   [<ul><li>...</li></ul>]
+                // <ul>[<li></li><li><ul><li></li>]</ul></li></ul> => [<ul><li></li><li><ul><li></li></ul></li></ul>]
+                fixListRange : (function()
+                {
+                        function getTopmost( node, end )
+                        {
+                                var parent,
+                                        savedNode = null;
+                                while ( node && ( parent = node.getParent() ) && !parent.is( 'html' ) &&
+                                        this.checkBoundaryOfElement( node, end ? CKEDITOR.END : CKEDITOR.START ) &&
+                                        node.equals( parent[ end ? 'getLast' : 'getFirst' ]( CKEDITOR.dom.walker.nodeType( CKEDITOR.NODE_ELEMENT ) ) ) )
+                                {
+                                        savedNode = node;
+                                        node = parent;
+                                }
+                                return savedNode;
+                        }
+
+                        return function()
+                        {
+                                var startRoot = getTopmost.call( this, this.startContainer.getAscendant( 'li', 1 ) ),
+                                        endRoot = getTopmost.call( this, this.endContainer.getAscendant( 'li', 1 ), 1 );
+
+                                if ( startRoot && endRoot && startRoot.equals( endRoot ) )
+                                {
+                                        this.setStartAt( startRoot, CKEDITOR.POSITION_BEFORE_START );
+                                        this.setEndAt( startRoot, CKEDITOR.POSITION_AFTER_END );
+                                        this.select();
+                                }
+                        };
+                })()
         };
 })();
 

_source/plugins/wysiwygarea/plugin.js

@@ -749 +749 @@
                                                                 if ( keyCode in { 8 : 1, 46 : 1 } )
                                                                 {
                                                                         var sel = editor.getSelection(),
-                                                                                control = sel.getSelectedElement();
+                                                                                control = sel && sel.getSelectedElement(),
+                                                                                range = sel && sel.getRanges()[ 0 ];
 
                                                                         if ( control )
                                                                         {
@@ -758 +759 @@
 
                                                                                 // Delete any element that 'hasLayout' (e.g. hr,table) in IE8 will
                                                                                 // break up the selection, safely manage it here. (#4795)
-                                                                                var bookmark = sel.getRanges()[ 0 ].createBookmark();
+                                                                                var bookmark = range.createBookmark();
                                                                                 // Remove the control manually.
                                                                                 control.remove();
                                                                                 sel.selectBookmarks( [ bookmark ] );
@@ -767 +768 @@
 
                                                                                 evt.data.preventDefault();
                                                                         }
+
+                                                                        // Handle cases of full-list selection from the inner side on delete (#7645).
+                                                                        range && range.fixListRange();
                                                                 }
                                                         } );