Ticket #1853: 1853_2.patch

_whatsnew.html

@@ -92 +92 @@
                         opened.</li>
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2024">#2024</a>] Fixed
                         JavaScript error in IE when the user tries to open dialogs in Source mode.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1853">#1853</a>] Setting
+                        ShiftEnterMode to p or div now works correctly when EnterMode is br.</li>
         </ul>
         <h3>
                 Version 2.6 Beta 1</h3>

editor/_source/classes/fckdomrange.js

@@ -755 +755 @@
          * and the PreviousBlock value will be null. The same is valid for the
          * NextBlock value if the range was at the end of the block.
          */
-        SplitBlock : function()
+        SplitBlock : function( forceBlockTag )
         {
+                var blockTag = forceBlockTag || FCKConfig.EnterMode ;
+
                 if ( !this._Range )
                         this.MoveToSelection() ;
 
@@ -768 +770 @@
                         var eEndBlock           = this.EndBlock ;
                         var oElementPath        = null ;
 
-                        if ( FCKConfig.EnterMode != 'br' )
+                        if ( blockTag != 'br' )
                         {
                                 if ( !eStartBlock )
                                 {
-                                        eStartBlock = this.FixBlock( true ) ;
+                                        eStartBlock = this.FixBlock( true, blockTag ) ;
                                         eEndBlock       = this.EndBlock ;       // FixBlock may have fixed the EndBlock too.
                                 }
 
                                 if ( !eEndBlock )
-                                        eEndBlock = this.FixBlock( false ) ;
+                                        eEndBlock = this.FixBlock( false, blockTag ) ;
                         }
 
                         // Get the range position.
@@ -840 +842 @@
         },
 
         // Transform a block without a block tag in a valid block (orphan text in the body or td, usually).
-        FixBlock : function( isStart )
+        FixBlock : function( isStart, blockTag )
         {
                 // Bookmark the range so we can restore it later.
                 var oBookmark = this.CreateBookmark() ;
@@ -852 +854 @@
                 this.Expand( 'block_contents' ) ;
 
                 // Create the fixed block.
-                var oFixedBlock = this.Window.document.createElement( FCKConfig.EnterMode ) ;
+                var oFixedBlock = this.Window.document.createElement( blockTag ) ;
 
                 // Move the contents of the temporary range to the fixed block.
                 this.ExtractContents().AppendTo( oFixedBlock ) ;

editor/_source/classes/fckenterkey.js

@@ -398 +398 @@
         // Get the current selection.
         var oRange = range || new FCKDomRange( this.Window ) ;
 
-        var oSplitInfo = oRange.SplitBlock() ;
+        var oSplitInfo = oRange.SplitBlock( blockTag ) ;
 
         if ( oSplitInfo )
         {