Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html (revision 5935)
+++ /CKEditor/trunk/CHANGES.html (revision 5936)
@@ -45,4 +45,5 @@
Fixed issues:
+ - #6225 : [FF] Can not transform sevaral lines to list with enterMode BR.
- #5399 : Lists pasted from Word do not maintain their nesting.
- #6377 : FF width and height are not shown for smiley in Image properties dialog.
Index: /CKEditor/trunk/_source/core/dom/range.js
===================================================================
--- /CKEditor/trunk/_source/core/dom/range.js (revision 5935)
+++ /CKEditor/trunk/_source/core/dom/range.js (revision 5936)
@@ -1430,5 +1430,5 @@
if( endNode.type == CKEDITOR.NODE_ELEMENT
&& CKEDITOR.dtd.$empty[ endNode.getName() ] )
- endNode = endNode.getParent(), endOffset = endNode.getIndex() + 1;
+ endOffset = endNode.getIndex() + 1, endNode = endNode.getParent();
this.endContainer = endNode;
Index: /CKEditor/trunk/_source/plugins/domiterator/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/domiterator/plugin.js (revision 5935)
+++ /CKEditor/trunk/_source/plugins/domiterator/plugin.js (revision 5936)
@@ -303,4 +303,7 @@
}
+ // Ignore bookmark nodes.(#3783)
+ var bookmarkGuard = CKEDITOR.dom.walker.bookmark( false, true );
+
if ( removePreviousBr )
{
@@ -317,7 +320,4 @@
if ( removeLastBr )
{
- // Ignore bookmark nodes.(#3783)
- var bookmarkGuard = CKEDITOR.dom.walker.bookmark( false, true );
-
var lastChild = block.getLast();
if ( lastChild && lastChild.type == CKEDITOR.NODE_ELEMENT && lastChild.getName() == 'br' )
@@ -340,4 +340,10 @@
}
+ if ( !bookmarkGuard( this._.nextNode ) )
+ {
+ this._.nextNode = this._.nextNode.getNextSourceNode( true, null, function( node )
+ { return !node.equals( lastNode ) && bookmarkGuard( node ); } );
+ }
+
return block;
}