Index: /FCKeditor/trunk/_whatsnew.html
===================================================================
--- /FCKeditor/trunk/_whatsnew.html (revision 183)
+++ /FCKeditor/trunk/_whatsnew.html (revision 184)
@@ -91,4 +91,6 @@
it was not possible to paste if "Allow paste operation via script" was disabled
in the browser security settings.
+
[#112] The enter
+ key now behaves correctly on lists with Firefox, when the EnterMode is set to 'br'.
Index: /FCKeditor/trunk/editor/_source/classes/fckenterkey.js
===================================================================
--- /FCKeditor/trunk/editor/_source/classes/fckenterkey.js (revision 183)
+++ /FCKeditor/trunk/editor/_source/classes/fckenterkey.js (revision 184)
@@ -273,9 +273,12 @@
}
-FCKEnterKey.prototype._ExecuteEnterBlock = function( blockTag )
+FCKEnterKey.prototype._ExecuteEnterBlock = function( blockTag, range )
{
// Get the current selection.
- var oRange = new FCKDomRange( this.Window ) ;
- oRange.MoveToSelection() ;
+ var oRange = range || new FCKDomRange( this.Window ) ;
+
+ // If we don't have a range, move it to the selection.
+ if ( !range )
+ oRange.MoveToSelection() ;
// The selection boundaries must be in the same "block limit" element.
@@ -437,5 +440,5 @@
if ( !bHasShift && sStartBlockTag == 'LI' )
- return this._ExecuteEnterBlock( null ) ;
+ return this._ExecuteEnterBlock( null, oRange ) ;
// If we are at the end of a header block.