Ticket #4129: 4129_2.patch

_source/plugins/list/plugin.js

@@ -402 +402 @@
                                                 ranges[ 0 ].selectNodeContents( paragraph );
                                         selection.selectRanges( ranges );
                                 }
-                        }
+                                // Maybe a single range there enclosing the whole list,
+                                // turn on the list state manually(#4129).
+                                else
+                                {
+                                        var range = ranges.length == 1 && ranges[ 0 ],
+                                                enclosedNode = range && range.getEnclosedNode();
+                                        if ( enclosedNode && enclosedNode.is
+                                                && this.type == enclosedNode.getName() )
+                                        {
+                                                setState.call( this, editor, CKEDITOR.TRISTATE_ON );
+                                        }
+                                }
+                        }
 
                         var bookmarks = selection.createBookmarks( true );
 

_source/plugins/wysiwygarea/plugin.js

@@ -190 +190 @@
 
                 // Inserting the padding-br before body if it's preceded by an
                 // unexitable block.
-                var lastNode = body.getLast( true );
+                var lastNode = body.getLast( CKEDITOR.dom.walker.whitespaces( true ) );
                 if ( lastNode && lastNode.getName && ( lastNode.getName() in nonExitableElementNames ) )
                 {
                         var paddingBlock = editor.document.createElement(

_source/core/dom/element.js

@@ -641 +641 @@
                 },
 
                 /**
-                 * @param ignoreEmpty Skip empty text nodes.
+                 * @param {Function} evaluator Filtering the result node.
                  */
-                getLast : function( ignoreEmpty )
+                getLast : function( evaluator )
                 {
-                        var $ = this.$.lastChild;
-                        if ( ignoreEmpty && $ && ( $.nodeType == CKEDITOR.NODE_TEXT )
-                                        && !CKEDITOR.tools.trim( $.nodeValue ) )
-                                return new CKEDITOR.dom.node( $ ).getPrevious( true );
-                        else
-                                return $ ? new CKEDITOR.dom.node( $ ) : null;
+                        var last = this.$.lastChild,
+                                retval = last && new CKEDITOR.dom.node( last );
+                        if ( retval && evaluator && !evaluator( retval ) )
+                                retval = retval.getPrevious( evaluator );
+
+                        return retval;
                 },
 
                 getStyle : function( name )

_source/tests/core/dom/element.html

@@ -536 +536 @@
                         }
                 },
 
+                // Test get last non-spaces child node.
+                test_getLast : function()
+                {
+                        var element = new CKEDITOR.dom.element( document.getElementById( 'append' ) );
+                        var span1 = new CKEDITOR.dom.element( 'span' );
+                        element.append( span1 );
+                        element.append( new CKEDITOR.dom.text( ' ' ) );
+                        element.append( new CKEDITOR.dom.text( ' ' ) );
+                        var last = element.getLast( CKEDITOR.dom.walker.whitespaces( true ) );
+                        assert.areSame( span1.$, last.$ );
+                },
+
+
                 name : document.title
         };
 })() );

_source/core/dom/range.js

@@ -1610 +1610 @@
                                 return false;
                 },
 
+                /**
+                 * Get the single node enclosed within the range if there's one.
+                 */
+                getEnclosedNode : function()
+                {
+                        var walkerRange = this.clone(),
+                                walker = new CKEDITOR.dom.walker( walkerRange ),
+                                isNotBookmarks = CKEDITOR.dom.walker.bookmark( true ),
+                                isNotWhitespaces = CKEDITOR.dom.walker.whitespaces( true ),
+                                evaluator = function( node )
+                                {
+                                        return isNotWhitespaces( node ) && isNotBookmarks( node );
+                                };
+                        walkerRange.evaluator = evaluator;
+                        var node = walker.next();
+                        walker.reset();
+                        return node && node.equals( walker.previous() ) ? node : null;
+                },
+
                 getTouchedStartNode : function()
                 {
                         var container = this.startContainer ;

_source/plugins/domiterator/plugin.js

@@ -83 +83 @@
                                 // Probably the document end is reached, we need a marker node.
                                 if ( !this._.lastNode )
                                 {
-                                                this._.lastNode = range.document.createText( '' );
-                                                this._.lastNode.insertAfter( lastNode );
+                                        this._.lastNode = this._.docEndMarker = range.document.createText( '' );
+                                        this._.lastNode.insertAfter( lastNode );
                                 }
 
                                 // Let's reuse this variable.
@@ -239 +239 @@
                                 // If no range has been found, this is the end.
                                 if ( !range )
                                 {
+                                        this._.docEndMarker && this._.docEndMarker.remove();
                                         this._.nextNode = null;
                                         return null;
                                 }

_source/core/dom/walker.js

@@ -304 +304 @@
                         lastBackward : function()
                         {
                                 return iterateToLast.call( this, true );
+                        },
+
+                        reset : function()
+                        {
+                                delete this.current;
+                                this._ = {};
                         }
 
                 }