Ticket #6297: 6297.patch

_source/plugins/domiterator/plugin.js

@@ -1 @@
-/*
+/*
 Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
@@ -126 +126 @@
                                 {
                                         var nodeName = currentNode.getName();
 
-                                        if ( currentNode.isBlockBoundary( this.forceBrBreak &&
-                                                        !parentPre && { br : 1 } ) )
+                                        if((( CKEDITOR.env.gecko || CKEDITOR.env.webkit || CKEDITOR.env.opera ) &&  blockTag == 'li' &&
+                                                        ( currentNode.getStyle( 'display' ) == 'block' || currentNode.getStyle( 'float' ) != '' )) ||
+                                                        !( currentNode.isBlockBoundary( this.forceBrBreak &&    !parentPre && { br : 1 } ))     )
                                         {
+                                                // If we have child nodes, let's check them.
+                                                if ( currentNode.getFirst() )
+                                                {
+                                                        // If we don't have a range yet, let's start it.
+                                                        if ( !range )
+                                                        {
+                                                                range = new CKEDITOR.dom.range( this.range.document );
+                                                                range.setStartAt( currentNode, CKEDITOR.POSITION_BEFORE_START );
+                                                        }
+
+                                                        currentNode = currentNode.getFirst();
+                                                        continue;
+                                                }
+                                                includeNode = true;
+                                        }
+                                        else
+                                        {
                                                 // <br> boundaries must be part of the range. It will
                                                 // happen only if ForceBrBreak.
                                                 if ( nodeName == 'br' )
@@ -156 +174 @@
 
                                                 closeRange = true;
                                         }
-                                        else
-                                        {
-                                                // If we have child nodes, let's check them.
-                                                if ( currentNode.getFirst() )
-                                                {
-                                                        // If we don't have a range yet, let's start it.
-                                                        if ( !range )
-                                                        {
-                                                                range = new CKEDITOR.dom.range( this.range.document );
-                                                                range.setStartAt( currentNode, CKEDITOR.POSITION_BEFORE_START );
-                                                        }
-
-                                                        currentNode = currentNode.getFirst();
-                                                        continue;
-                                                }
-                                                includeNode = true;
-                                        }
-                                }
+                                }
                                 else if ( currentNode.type == CKEDITOR.NODE_TEXT )
                                 {
                                         // Ignore normal whitespaces (i.e. not including &nbsp; or

_source/plugins/list/plugin.js

@@ -1 @@
-?/*
+/*
 Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
@@ -471 +471 @@
 
                                 iterator.forceBrBreak = ( this.state == CKEDITOR.TRISTATE_OFF );
 
-                                while ( ( block = iterator.getNextParagraph() ) )
+                                while ( ( block = iterator.getNextParagraph('li') ) )
                                 {
                                         // Avoid duplicate blocks get processed across ranges.
                                         if( block.getCustomData( 'list_block' ) )