Ticket #3165: 3165_2.patch

_source/plugins/enterkey/plugin.js

@@ -101 +101 @@
                 if ( !isStartOfBlock && !isEndOfBlock )
                 {
                         // If the next block is an <li> with another list tree as the first
-                        // child, we'll need to append a placeholder or the list item
+                        // child, we'll need to append a filler (<br>/NBSP) or the list item
                         // wouldn't be editable. (#1420)
-                        if ( nextBlock.is( 'li' ) && ( node = nextBlock.getFirst() )
-                                        && node.is && node.is( 'ul', 'ol') )
-                                nextBlock.insertBefore( doc.createText( '\xa0' ), node );
+                        if ( nextBlock.is( 'li' )
+                                 && ( node = nextBlock.getFirst( CKEDITOR.dom.walker.invisible( true ) ) )
+                                 && node.is && node.is( 'ul', 'ol' ) )
+                                ( CKEDITOR.env.ie ? doc.createText( '\xa0') : doc.createElement( 'br' ) ).insertBefore( node );
 
                         // Move the selection to the end block.
                         if ( nextBlock )

_source/core/dom/element.js

@@ -627 +627 @@
 
                 /**
                  * Gets the first child node of this element.
+                 * @param {Function} evaluator Filtering the result node.
                  * @returns {CKEDITOR.dom.node} The first child node or null if not
                  *              available.
                  * @example
@@ -634 +635 @@
                  * var first = <b>element.getFirst()</b>;
                  * alert( first.getName() );  // "b"
                  */
-                getFirst : function()
+                getFirst : function( evaluator )
                 {
-                        var $ = this.$.firstChild;
-                        return $ ? new CKEDITOR.dom.node( $ ) : null;
+                        var first = this.$.firstChild,
+                                retval = first && new CKEDITOR.dom.node( first );
+                        if ( retval && evaluator && !evaluator( retval ) )
+                                retval = retval.getNext( evaluator );
+
+                        return retval;
                 },
 
                 /**

_source/core/dom/walker.js

@@ -408 +408 @@
                         return isReject ^ isWhitespace;
                 };
         };
+
+        /**
+         * Whether the node is invisible in wysiwyg mode.
+         * @param isReject
+         */
+        CKEDITOR.dom.walker.invisible = function( isReject )
+        {
+                var whitespace = CKEDITOR.dom.walker.whitespaces();
+                return function( node )
+                {
+                        // Nodes that take no spaces in wysiwyg:
+                        // 1. White-spaces but not including NBSP;
+                        // 2. Empty inline elements, e.g. <b></b> we're checking here 'offsetHeight'
+                        // instead of width for properly excluding all sorts of empty paragraph, e.g. <br />.
+                        var isInvisible = whitespace( node )
+                                        || !node.$.offsetHeight;
+                        return isReject ^ isInvisible;
+                };
+        };
+
 })();

_source/plugins/htmldataprocessor/plugin.js

@@ -45 +45 @@
                 return !lastChild || lastChild.type == CKEDITOR.NODE_ELEMENT && lastChild.name == 'br';
         }
 
+        function extendNestedListForDisplay( list )
+        {
+                var children = list.children,
+                        firstChild = children && children[ 0 ],
+                        secondChild = children && children[ 1 ];
+
+                if( firstChild &&
+                    firstChild.type == CKEDITOR.NODE_TEXT
+                        && tailNbspRegex.test( firstChild.value )
+                    && secondChild && secondChild.type == CKEDITOR.NODE_ELEMENT
+                        && secondChild.name in CKEDITOR.dtd.$list )
+                        children[ 0 ] = new CKEDITOR.htmlParser.element( 'br', {} );
+        }
+
         function extendBlockForDisplay( block )
         {
                 trimFillers( block, true );
@@ -66 +80 @@
                         block.add( new CKEDITOR.htmlParser.text( '\xa0' ) );
         }
 
+        function extendNestedListForOutput( list )
+        {
+                var children = list.children,
+                        firstChild = children && children[ 0 ],
+                        secondChild = children && children[ 1 ];
+
+                if( firstChild && firstChild.type == CKEDITOR.NODE_ELEMENT
+                        && firstChild.name == 'br'
+                    && secondChild && secondChild.type == CKEDITOR.NODE_ELEMENT
+                        && secondChild.name in CKEDITOR.dtd.$list )
+                        children[ 0 ] = new CKEDITOR.htmlParser.text( '\xa0' );
+        }
+
         var dtd = CKEDITOR.dtd;
 
         // Find out the list of block-like tags that can contain <br>.
@@ -93 +120 @@
         for ( i in blockLikeTags )
                 defaultDataBlockFilterRules.elements[ i ] = extendBlockForDisplay;
 
+        var defaultListDataFilterRules = { elements : {} };
+        if( !CKEDITOR.env.ie )
+        {
+                for( i in dtd.$listItem )
+                        defaultListDataFilterRules.elements[ i ] = extendNestedListForDisplay;
+        }
+
         var defaultHtmlFilterRules =
                 {
                         elementNames :
@@ -189 +223 @@
         for ( i in blockLikeTags )
                 defaultHtmlBlockFilterRules.elements[ i ] = extendBlockForOutput;
 
+        var defaultListHtmlFilterRules = { elements : {} };
+        if( !CKEDITOR.env.ie )
+        {
+                for( i in dtd.$listItem )
+                        defaultListHtmlFilterRules.elements[ i ] = extendNestedListForOutput;
+        }
+
         if ( CKEDITOR.env.ie )
         {
                 // IE outputs style attribute in capital letters. We should convert
@@ -293 +334 @@
 
                         dataProcessor.dataFilter.addRules( defaultDataFilterRules );
                         dataProcessor.dataFilter.addRules( defaultDataBlockFilterRules );
+                        dataProcessor.dataFilter.addRules( defaultListDataFilterRules );
                         dataProcessor.htmlFilter.addRules( defaultHtmlFilterRules );
                         dataProcessor.htmlFilter.addRules( defaultHtmlBlockFilterRules );
+                        dataProcessor.htmlFilter.addRules( defaultListHtmlFilterRules );
                 }
         });