Ticket #2403: forceenter.patch

editor/_source/classes/fckenterkey.js

@@ -481 +481 @@
                         {
                                 var sPreviousBlockTag = ePreviousBlock.tagName.toUpperCase() ;
 
-                                // If is a header tag, or we are in a Shift+Enter (#77),
-                                // create a new block element (later in the code).
-                                if ( !this._HasShift && !(/^H[1-6]$/).test( sPreviousBlockTag ) )
+                                // If is a header tag, or we are in a Shift+Enter (#77), or
+                                // ForceEnterMode, create a new block element (later in the code).
+                                // Except in ForceEnterMode, if last block is same as block we want
+                                // to create or a list item, clone the last block instead. This
+                                // stops Enter always ending a list, and if a block has attributes
+                                // (eg dir="rtl"), they're cloned to the new block
+                                if ( !this._HasShift && !(/^H[1-6]$/).test( sPreviousBlockTag ) &&
+                                        ( !FCKConfig.ForceEnterMode || sPreviousBlockTag == blockTag.toUpperCase() || sPreviousBlockTag == 'LI' ) )
                                 {
                                         // Otherwise, duplicate the previous block.
                                         eNewBlock = FCKDomTools.CloneElement( ePreviousBlock ) ;
                                 }
                         }
-                        else if ( eNextBlock )
+                        else if ( eNextBlock && !FCKConfig.ForceEnterMode )
                                 eNewBlock = FCKDomTools.CloneElement( eNextBlock ) ;
 
                         if ( !eNewBlock )