Ticket #2287: 2287_2.patch

_whatsnew.html

@@ -61 +61 @@
                         for those who wish to force the #183 fix to be enabled.</li> 
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2276">#2276</a>] [<a target="_blank" href="http://dev.fckeditor.net/ticket/2279">#2279</a>] On Opera
                         and Firefox 3, the entire page was scrolling on ENTER.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2287">#2287</a>] On some
+                        specific cases, with Firefox 2, some extra spacing was appearing in the final HTML
+                        on posting, if inserting two successive tables.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2287">#2287</a>] Block
+                        elements (like tables or horizontal rules) will be inserted correctly now when the
+                        cursor is at the start or the end of blocks. No extra paragraphs will be included
+                        in this operation.</li>
         </ul>
         <p>
         </p>

editor/_source/classes/fckdomrange.js

@@ -868 +868 @@
                 this.ExtractContents().AppendTo( oFixedBlock ) ;
                 FCKDomTools.TrimNode( oFixedBlock ) ;
 
+                // If the fixed block is empty (not counting bookmark nodes)
+                // Add a <br /> inside to expand it.
+                if ( FCKDomTools.CheckIsEmptyElement(oFixedBlock, function( element ) { return element.getAttribute('_fck_bookmark') != 'true' ; } )
+                                && FCKBrowserInfo.IsGeckoLike )
+                                FCKTools.AppendBogusBr( oFixedBlock ) ;
+
                 // Insert the fixed block into the DOM.
                 this.InsertNode( oFixedBlock ) ;
 

editor/_source/internals/fck.js

@@ -673 +673 @@
                 // object that may internally supply this feature.
                 var range = new FCKDomRange( this.EditorWindow ) ;
 
+                // Move to the selection and delete it.
+                range.MoveToSelection() ;
+                range.DeleteContents() ;
+
                 if ( FCKListsLib.BlockElements[ elementName ] != null )
                 {
-                        range.SplitBlock() ;
+                        if ( range.StartBlock )
+                        {
+                                if ( range.CheckStartOfBlock() )
+                                        range.MoveToPosition( range.StartBlock, 3 ) ;
+                                else if ( range.CheckEndOfBlock() )
+                                        range.MoveToPosition( range.StartBlock, 4 ) ;
+                                else
+                                        range.SplitBlock() ;
+                        }
+
                         range.InsertNode( element ) ;
 
                         var next = FCKDomTools.GetNextSourceElement( element, false, null, [ 'hr','br','param','img','area','input' ], true ) ;
@@ -705 +718 @@
                 }
                 else
                 {
-                        // Delete the current selection and insert the node.
-                        range.MoveToSelection() ;
-                        range.DeleteContents() ;
+                        // Insert the node.
                         range.InsertNode( element ) ;
 
                         // Move the selection right after the new element.