Ticket #7380: 7380.patch

_source/plugins/list/plugin.js

@@ -633 +633 @@
         };
 
         var dtd = CKEDITOR.dtd;
-        var tailNbspRegex = /[\t\r\n ]*(?: |\xa0)$/;
+        var tailNbspRegex = /^[\t\r\n ]*(?: |\xa0)$/;
 
         function indexOfFirstChildElement( element, tagNameList )
         {
@@ -653 +653 @@
 
         function getExtendNestedListFilter( isHtmlFilter )
         {
-                // An element filter function that corrects nested list start in an empty
-                // list item for better displaying/outputting. (#3165)
+                function createFillerNode()
+                {
+                        return ( isHtmlFilter || CKEDITOR.env.ie ) ?
+                                   new CKEDITOR.htmlParser.text( '\xa0' ) :
+                                        new CKEDITOR.htmlParser.element( 'br', {} );
+                }
+
+                // Handle BRs before nested list element (pseudo list item). (#3165) (#7380)
                 return function( listItem )
                 {
                         var children = listItem.children,
                                 firstNestedListIndex = indexOfFirstChildElement( listItem, dtd.$list ),
                                 firstNestedList = children[ firstNestedListIndex ],
                                 nodeBefore = firstNestedList && firstNestedList.previous,
+                                nodeIndex = firstNestedListIndex - 1,
                                 tailNbspmatch;
 
-                        if ( nodeBefore
-                                && ( nodeBefore.name && nodeBefore.name == 'br'
-                                        || nodeBefore.value && ( tailNbspmatch = nodeBefore.value.match( tailNbspRegex ) ) ) )
+                        // BR at the end of a pseudo block is required only if it's the first child
+                        // or it's proceeded by other brs.
+                        if ( nodeBefore && nodeBefore.name && nodeBefore.name == 'br' )
                         {
                                 var fillerNode = nodeBefore;
-
-                                // Always use 'nbsp' as filler node if we found a nested list appear
-                                // in front of a list item.
-                                if ( !( tailNbspmatch && tailNbspmatch.index ) && fillerNode == children[ 0 ] )
-                                        children[ 0 ] = ( isHtmlFilter || CKEDITOR.env.ie ) ?
-                                                         new CKEDITOR.htmlParser.text( '\xa0' ) :
-                                                                         new CKEDITOR.htmlParser.element( 'br', {} );
-
-                                // Otherwise the filler is not needed anymore.
-                                else if ( fillerNode.name == 'br' )
-                                        children.splice( firstNestedListIndex - 1, 1 );
+                                nodeBefore = fillerNode.previous;
+                                if ( !nodeBefore || nodeBefore.type == CKEDITOR.NODE_ELEMENT && nodeBefore.name == 'br' )
+                                        children.splice( nodeIndex, 1, createFillerNode() );
                                 else
-                                        fillerNode.value = fillerNode.value.replace( tailNbspRegex, '' );
+                                        children.splice( nodeIndex, 1 );
                         }
 
+                        if ( nodeBefore && nodeBefore.type == CKEDITOR.NODE_TEXT && tailNbspRegex.test( nodeBefore.value ) )
+                                children.splice( nodeIndex, 1, createFillerNode() );
                 };
         }