Ticket #3165: 3165_3.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/plugins/selection/plugin.js

@@ -986 +986 @@
                                 // will expand and that the cursor will be blinking on the right place.
                                 // Actually, we are using this flag just to avoid using this hack in all
                                 // situations, but just on those needed.
-                                isStartMarkerAlone = forceExpand || !startNode.hasPrevious() || ( startNode.getPrevious().is && startNode.getPrevious().is( 'br' ) );
+                                var next = startNode.getNext();
+                                isStartMarkerAlone = ( !( next && next.getText && next.getText() && !CKEDITOR.tools.trim( next.getText() ) )
+                                                                          && ( forceExpand || !startNode.hasPrevious() || ( startNode.getPrevious().is && startNode.getPrevious().is( 'br' ) ) ) );
 
                                 // Append a temporary <span>&#65279;</span> before the selection.
                                 // This is needed to avoid IE destroying selections inside empty

_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.is && !node.$.offsetHeight;
+                        return isReject ^ isInvisible;
+                };
+        };
+
 })();

_source/plugins/htmldataprocessor/plugin.js

@@ -7 +7 @@
 {
         // Regex to scan for   at the end of blocks, which are actually placeholders.
         // Safari transforms the   to \xa0. (#4172)
-        var tailNbspRegex = /^[\t\r\n ]*(?: |\xa0)$/;
-
+        var tailNbspRegex = /[\t\r\n ]*(?: |\xa0)[\t\r\n ]*$/;
         var protectedSourceMarker = '{cke_protected}';
+        var dtd = CKEDITOR.dtd;
 
 
         // Return the last non-space child node of the block (#4344).
@@ -22 +22 @@
                 return last;
         }
 
+        function indexOfFirstChildElement( element, tagNameList )
+        {
+                var children = element.children,
+                        child,
+                        length = children.length;
+                for ( var i = 0; i < length; i++ )
+                {
+                        child = children[ i ];
+                        if( child.name && ( child.name in tagNameList ) )
+                                return i;
+                }
+        }
+
         function trimFillers( block, fromSource )
         {
                 // If the current node is a block, and if we're converting from source or
@@ -35 +48 @@
                         if ( ( fromSource || !CKEDITOR.env.ie ) && lastChild.type == CKEDITOR.NODE_ELEMENT && lastChild.name == 'br' )
                                 children.pop();
                         if ( lastChild.type == CKEDITOR.NODE_TEXT && tailNbspRegex.test( lastChild.value ) )
-                                children.pop();
+                                lastChild.value = lastChild.value.replace( tailNbspRegex, '' );
                 }
         }
 
@@ -66 +79 @@
                         block.add( new CKEDITOR.htmlParser.text( '\xa0' ) );
         }
 
-        var dtd = CKEDITOR.dtd;
+        function getExtendNestedListFilter( isHtmlFilter )
+        {
+                return function( listItem )
+                {
+                        var children = listItem.children,
+                                firstNestedListIndex = indexOfFirstChildElement( listItem, dtd.$list ),
+                                firstNestedList = children[ firstNestedListIndex ],
+                                nodeBefore = firstNestedList && firstNestedList.previous,
+                                tailNbspmatch;
 
+                        if( nodeBefore
+                                && ( nodeBefore.name && nodeBefore.name == 'br'
+                                        || nodeBefore.value && ( tailNbspmatch = nodeBefore.value.match( tailNbspRegex ) ) ) )
+                        {
+                                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 );
+                                else
+                                        fillerNode.value = fillerNode.value.replace( tailNbspRegex, '' );
+                        }
+
+                };
+        }
+
         // Find out the list of block-like tags that can contain <br>.
         var blockLikeTags = CKEDITOR.tools.extend( {}, dtd.$block, dtd.$listItem, dtd.$tableContent );
         for ( var i in blockLikeTags )
@@ -93 +137 @@
         for ( i in blockLikeTags )
                 defaultDataBlockFilterRules.elements[ i ] = extendBlockForDisplay;
 
+        var defaultListDataFilterRules = { elements : {} };
+        for( i in dtd.$listItem )
+                defaultListDataFilterRules.elements[ i ] = getExtendNestedListFilter();
+
         var defaultHtmlFilterRules =
                 {
                         elementNames :
@@ -189 +237 @@
         for ( i in blockLikeTags )
                 defaultHtmlBlockFilterRules.elements[ i ] = extendBlockForOutput;
 
+        var defaultListHtmlFilterRules = { elements : {} };
+        for( i in dtd.$listItem )
+                defaultListHtmlFilterRules.elements[ i ] = getExtendNestedListFilter( true );
+
         if ( CKEDITOR.env.ie )
         {
                 // IE outputs style attribute in capital letters. We should convert
@@ -293 +345 @@
 
                         dataProcessor.dataFilter.addRules( defaultDataFilterRules );
                         dataProcessor.dataFilter.addRules( defaultDataBlockFilterRules );
+                        dataProcessor.dataFilter.addRules( defaultListDataFilterRules );
                         dataProcessor.htmlFilter.addRules( defaultHtmlFilterRules );
                         dataProcessor.htmlFilter.addRules( defaultHtmlBlockFilterRules );
+                        dataProcessor.htmlFilter.addRules( defaultListHtmlFilterRules );
                 }
         });