Changeset 1119

Timestamp:

2007-11-26 09:10:41 (2 years ago)

Author:

martinkou

Message:

Fixed #1562 : Fixed the issue where empty paragraphs are added around page breaks when switching to Source mode.
Fixed the issue where page breaks are added inside paragraph blocks.

Location:

FCKeditor/trunk/editor/_source

Files:

• commandclasses/fck_othercommands.js (modified) (1 diff)
• internals/fck.js (modified) (1 diff)

FCKeditor/trunk/editor/_source/commandclasses/fck_othercommands.js

@@ -250 +250 @@
 
         var oFakeImage = FCKDocumentProcessor_CreateFakeImage( 'FCK__PageBreak', e ) ;
-        FCK.InsertElement( oFakeImage ) ;
+        var oRange = new FCKDomRange( FCK.EditorWindow ) ;
+        oRange.MoveToSelection() ;
+        var oSplitInfo = oRange.SplitBlock() ;
+        if ( oSplitInfo.NextBlock )
+                oSplitInfo.NextBlock.parentNode.insertBefore( oFakeImage, oSplitInfo.NextBlock ) ;
+        else
+                oSplitInfo.PreviousBlock.parentNode.insertBefore( oFakeImage, oSplitInfo.PreviousBlock.nextSibling ) ;
+
+        FCK.Events.FireEvent( 'OnSelectionChange' ) ;
 }
 

FCKeditor/trunk/editor/_source/internals/fck.js

@@ -177 +177 @@
                                 // Element Node.
                                 case 1 :
-                                        if ( !FCKListsLib.BlockElements[ oNode.nodeName.toLowerCase() ] )
+                                        if ( !FCKListsLib.BlockElements[ oNode.nodeName.toLowerCase() ] && 
+                                                        !oNode.getAttribute('_fckfakelement') )
                                                 bMoveNode = true ;
                                         break ;