Ticket #243: block_split.patch

editor/_source/classes/fckdomrange.js

@@ -180 +180 @@
                 oTestRange.SetEnd( oTestRange.EndBlock || oTestRange.EndBlockLimit, 2 ) ;
 
                 var bIsEndOfBlock = oTestRange.CheckIsCollapsed() ;
-                
+
                 if ( !bIsEndOfBlock )
                 {
                         // Inserts the contents of the range in a div tag.
                         var eToolDiv = this.Window.document.createElement( 'div' ) ;
                         oTestRange._Range.cloneContents().AppendTo( eToolDiv ) ;
                         FCKDomTools.TrimNode( eToolDiv, true ) ;
-                        
+
                         // Find out if we are in an empty tree of inline elements, like <b><i><span></span></i></b>
                         bIsEndOfBlock = true ;
                         var eLastChild = eToolDiv ;
@@ -205 +205 @@
                                 }
                         }
                 }
-                
+
                 oTestRange.Release() ;
 
                 if ( refreshSelection )
@@ -272 +272 @@
                 }
                 else
                         this.Collapse( true ) ;
+
+                this._UpdateElementInfo() ;
         },
 
+        MoveToPosition : function( targetElement, position )
+        {
+                this.SetStart( targetElement, position ) ;
+                this.Collapse( true ) ;
+        },
+
         /*
          * Moves the position of the start boundary of the range to a specific position
          * relatively to a element.
@@ -441 +449 @@
                 }
         },
 
+        SplitBlock : function()
+        {
+                if ( !this._Range )
+                        this.MoveToSelection() ;
+
+                // The selection boundaries must be in the same "block limit" element.
+                if ( this.StartBlockLimit == this.EndBlockLimit )
+                {
+                        // Get the current blocks.
+                        var eStartBlock         = this.StartBlock ;
+                        var eEndBlock           = this.EndBlock ;
+
+                        if ( FCKConfig.EnterMode != 'br' )
+                        {
+                                if ( !eStartBlock )
+                                {
+                                        eStartBlock = this._FixBlock( true ) ;
+                                        eEndBlock       = this.EndBlock ;       // _FixBlock may have fixed the EndBlock too.
+                                }
+
+                                if ( !eEndBlock )
+                                        eEndBlock = this._FixBlock( false ) ;
+                        }
+
+                        var bIsStartOfBlock     = ( eStartBlock != null && this.CheckStartOfBlock() ) ;
+                        var bIsEndOfBlock       = ( eEndBlock != null && this.CheckEndOfBlock() ) ;
+
+                        // Delete the current selection.
+                        if ( !this.CheckIsEmpty() )
+                                this.DeleteContents() ;
+
+                        if ( eStartBlock && eEndBlock &&  eStartBlock == eEndBlock )
+                        {
+                                if ( bIsStartOfBlock )
+                                {
+                                        this.MoveToPosition( eStartBlock, 3 ) ;
+                                        eStartBlock = null ;
+                                }
+                                else if ( bIsEndOfBlock )
+                                {
+                                        this.MoveToPosition( eEndBlock, 4 ) ;
+                                        eEndBlock = null ;
+                                }
+                                else
+                                {
+                                        // Extract the contents of the block from the selection point to the end of its contents.
+                                        this.SetEnd( eStartBlock, 2 ) ;
+                                        var eDocFrag = this.ExtractContents() ;
+                                        FCKDomTools.TrimNode( eDocFrag.RootNode ) ;
+
+                                        // Duplicate the block element after it.
+                                        eEndBlock = eStartBlock.cloneNode( false ) ;
+
+                                        // Place the extracted contents in the duplicated block.
+                                        eDocFrag.AppendTo( eEndBlock ) ;
+
+                                        FCKDomTools.InsertAfterNode( eStartBlock, eEndBlock ) ;
+
+                                        this.MoveToPosition( eStartBlock, 4 ) ;
+                                }
+                        }
+
+                        if ( FCKBrowserInfo.IsGecko )
+                        {
+                                // In Gecko, the last child node must be a bogus <br>.
+                                FCKTools.AppendBogusBr( eStartBlock ) ;
+                                FCKTools.AppendBogusBr( eEndBlock ) ;
+                        }
+
+                        return {
+                                PreviousBlock   : eStartBlock,
+                                NextBlock               : eEndBlock,
+                                WasStartOfBlock : bIsStartOfBlock,
+                                WasEndOfBlock   : bIsEndOfBlock
+                        } ;
+                }
+
+                return null ;
+        },
+
+                // Transform a block without a block tag in a valid block (orphan text in the body or td, usually).
+        _FixBlock : function( isStart )
+        {
+                // Bookmark the range so we can restore it later.
+                var oBookmark = this.CreateBookmark() ;
+
+                // Collapse the range to the requested ending boundary.
+                this.Collapse( isStart ) ;
+
+                // Expands it to the block contents.
+                this.Expand( 'block_contents' ) ;
+
+                // Create the fixed block.
+                var oFixedBlock = this.Window.document.createElement( FCKConfig.EnterMode ) ;
+
+                // Move the contents of the temporary range to the fixed block.
+                this.ExtractContents().AppendTo( oFixedBlock ) ;
+                FCKDomTools.TrimNode( oFixedBlock ) ;
+
+                // Insert the fixed block into the DOM.
+                this.InsertNode( oFixedBlock ) ;
+
+                // Move the range back to the bookmarked place.
+                this.MoveToBookmark( oBookmark ) ;
+
+                return oFixedBlock ;
+        },
+
         Release : function( preserveWindow )
         {
                 if ( !preserveWindow )

editor/_source/classes/fckenterkey.js

@@ -202 +202 @@
                         this._OutdentWithSelection( currentBlock, range ) ;
                         return true ;
                 }
-                
+
                 // Take a reference to the parent for post processing cleanup.
                 var oCurrentParent = currentBlock.parentNode ;
 
@@ -284 +284 @@
         // Get the current selection.
         var oRange = range || new FCKDomRange( this.Window ) ;
 
-        // If we don't have a range, move it to the selection.
-        if ( !range )
-                oRange.MoveToSelection() ;
+        var oSplitInfo = oRange.SplitBlock() ;
 
-        // The selection boundaries must be in the same "block limit" element.
-        if ( oRange.StartBlockLimit == oRange.EndBlockLimit )
+        if ( oSplitInfo )
         {
-                // If the StartBlock or EndBlock are not available (for text without a
-                // block tag), we must fix them, by moving the text to a block.
-                if ( !oRange.StartBlock )
-                        this._FixBlock( oRange, true, blockTag ) ;
-
-                if ( !oRange.EndBlock )
-                        this._FixBlock( oRange, false, blockTag ) ;
-
                 // Get the current blocks.
-                var eStartBlock = oRange.StartBlock ;
-                var eEndBlock   = oRange.EndBlock ;
+                var ePreviousBlock      = oSplitInfo.PreviousBlock ;
+                var eNextBlock          = oSplitInfo.NextBlock ;
 
-                // Delete the current selection.
-                if ( !oRange.CheckIsEmpty() )
-                        oRange.DeleteContents() ;
+                var bIsStartOfBlock     = oSplitInfo.WasStartOfBlock ;
+                var bIsEndOfBlock       = oSplitInfo.WasEndOfBlock ;
 
-                // If the selection boundaries are in the same block element
-                if ( eStartBlock == eEndBlock )
+                // If we have both the previous and next blocks, it means that the
+                // boundaries were on separated blocks, or none of them where on the
+                // block limits (start/end).
+                if ( !oSplitInfo.WasStartOfBlock && !oSplitInfo.WasEndOfBlock )
                 {
+                        // Move the selection to the end block.
+                        if ( eNextBlock )
+                                oRange.MoveToElementEditStart( eNextBlock ) ;
+                }
+                else
+                {
+                        if ( bIsStartOfBlock && bIsEndOfBlock && eNextBlock.tagName.toUpperCase() == 'LI' )
+                        {
+                                oRange.MoveToElementStart( eNextBlock ) ;
+                                this._OutdentWithSelection( eNextBlock, oRange ) ;
+                                oRange.Release() ;
+                                return true ;
+                        }
+
                         var eNewBlock ;
 
-                        var bIsStartOfBlock     = oRange.CheckStartOfBlock() ;
-                        var bIsEndOfBlock       = oRange.CheckEndOfBlock() ;
-
-                        if ( bIsStartOfBlock && !bIsEndOfBlock )
+                        if ( ePreviousBlock )
                         {
-                                eNewBlock = eStartBlock.cloneNode(false) ;
+                                var sPreviousBlockTag = ePreviousBlock.tagName.toUpperCase() ;
 
-                                if ( FCKBrowserInfo.IsGeckoLike )
-                                        eNewBlock.innerHTML = GECKO_BOGUS ;
-
-                                // Place the new block before the current block element.
-                                eStartBlock.parentNode.insertBefore( eNewBlock, eStartBlock ) ;
-
-                                // This is tricky, but to make the new block visible correctly
-                                // we must select it.
-                                if ( FCKBrowserInfo.IsIE )
+                                // If is a header tag, or we are in a Shift+Enter (#77),
+                                // create a new block element.
+                                if ( this._HasShift || (/^H[1-6]$/).test( sPreviousBlockTag ) )
+                                        eNewBlock = this.Window.document.createElement( blockTag ) ;
+                                else
                                 {
-                                        // Move the selection to the new block.
-                                        oRange.MoveToNodeContents( eNewBlock ) ;
-
-                                        oRange.Select() ;
+                                        // Otherwise, duplicate the previous block.
+                                        eNewBlock = ePreviousBlock.cloneNode( false ) ;
+                                        this._RecreateEndingTree( ePreviousBlock, eNewBlock ) ;
                                 }
-
-                                // Move the selection to the new block.
-                                oRange.MoveToElementEditStart( eStartBlock ) ;
                         }
-                        else
+                        else if ( eNextBlock )
                         {
-                                // Check if the selection is at the end of the block.
-                                if ( bIsEndOfBlock )
-                                {
-                                        var sStartBlockTag = eStartBlock.tagName.toUpperCase() ;
+                                eNewBlock = eNextBlock.cloneNode( false ) ;
+                        }
+                        else
+                                eNewBlock = this.Window.document.createElement( blockTag ) ;
 
-                                        // If the entire block is selected, and we are in a LI, let's decrease its indentation.
-                                        if ( bIsStartOfBlock && sStartBlockTag == 'LI' )
-                                        {
-                                                this._OutdentWithSelection( eStartBlock, oRange ) ;
-                                                oRange.Release() ;
-                                                return true ;
-                                        }
-                                        else
-                                        {
-                                                // If is a header tag, or we are in a Shift+Enter (#77),
-                                                // create a new block element.
-                                                if ( (/^H[1-6]$/).test( sStartBlockTag ) || this._HasShift )
-                                                        eNewBlock = this.Window.document.createElement( blockTag ) ;
-                                                // Otherwise, duplicate the current block.
-                                                else
-                                                {
-                                                        eNewBlock = eStartBlock.cloneNode(false) ;
-                                                        this._RecreateEndingTree( eStartBlock, eNewBlock ) ;
-                                                }
+                        if ( FCKBrowserInfo.IsGeckoLike )
+                                eNewBlock.innerHTML = GECKO_BOGUS ;
 
-                                                if ( FCKBrowserInfo.IsGeckoLike )
-                                                {
-                                                        eNewBlock.innerHTML = GECKO_BOGUS ;
+                        oRange.InsertNode( eNewBlock ) ;
 
-                                                        // If the entire block is selected, let's add a bogus in the start block.
-                                                        if ( bIsStartOfBlock )
-                                                                eStartBlock.innerHTML = GECKO_BOGUS ;
-                                                }
-                                        }
-                                }
-                                else
-                                {
-                                        // Extract the contents of the block from the selection point to the end of its contents.
-                                        oRange.SetEnd( eStartBlock, 2 ) ;
-                                        var eDocFrag = oRange.ExtractContents() ;
+                        // This is tricky, but to make the new block visible correctly
+                        // we must select it.
+                        if ( FCKBrowserInfo.IsIE )
+                        {
+                                // Move the selection to the new block.
+                                oRange.MoveToNodeContents( eNewBlock ) ;
+                                oRange.Select() ;
+                        }
 
-                                        // Duplicate the block element after it.
-                                        eNewBlock = eStartBlock.cloneNode(false) ;
+                        oRange.MoveToElementEditStart( bIsStartOfBlock ? eNextBlock : eNewBlock ) ;
 
-                                        // It could be that we are in a LI with a child UL/OL. Insert a bogus to give us space to type.
-                                        FCKDomTools.TrimNode( eDocFrag.RootNode ) ;
-                                        if ( eDocFrag.RootNode.firstChild.nodeType == 1 && eDocFrag.RootNode.firstChild.tagName.toUpperCase().Equals( 'UL', 'OL' ) )
-                                                eNewBlock.innerHTML = GECKO_BOGUS ;
-
-                                        // Place the extracted contents in the duplicated block.
-                                        eDocFrag.AppendTo( eNewBlock ) ;
-
-                                        if ( FCKBrowserInfo.IsGecko )
-                                        {
-                                                // In Gecko, the last child node must be a bogus <br>.
-                                                this._AppendBogusBr( eStartBlock ) ;
-                                                this._AppendBogusBr( eNewBlock ) ;
-                                        }
-                                }
-
-                                if ( eNewBlock )
-                                {
-                                        FCKDomTools.InsertAfterNode( eStartBlock, eNewBlock ) ;
-
-                                        // Move the selection to the new block.
-                                        oRange.MoveToElementEditStart( eNewBlock ) ;
-
-                                        if ( FCKBrowserInfo.IsGecko )
-                                                eNewBlock.scrollIntoView( false ) ;
-                                }
-                        }
+                        if ( FCKBrowserInfo.IsGecko )
+                                eNewBlock.scrollIntoView( false ) ;
                 }
-                else
-                {
-                        // Move the selection to the end block.
-                        oRange.MoveToElementEditStart( eEndBlock ) ;
-                }
 
                 oRange.Select() ;
         }
@@ -454 +394 @@
                 // If we are at the end of a header block.
                 if ( !bHasShift && bIsEndOfBlock && (/^H[1-6]$/).test( sStartBlockTag ) )
                 {
-                        FCKDebug.Output( 'BR - Header' ) ;
-
                         // Insert a BR after the current paragraph.
                         FCKDomTools.InsertAfterNode( oRange.StartBlock, this.Window.document.createElement( 'br' ) ) ;
 
@@ -468 +406 @@
                 }
                 else
                 {
-                        FCKDebug.Output( 'BR - No Header' ) ;
-
                         var eBr = this.Window.document.createElement( 'br' ) ;
 
                         oRange.InsertNode( eBr ) ;
@@ -480 +416 @@
 
                         // If we are at the end of a block, we must be sure the bogus node is available in that block.
                         if ( bIsEndOfBlock && FCKBrowserInfo.IsGecko )
-                                this._AppendBogusBr( eBr.parentNode ) ;
+                                FCKTools.AppendBogusBr( eBr.parentNode ) ;
 
                         if ( FCKBrowserInfo.IsIE )
                                 oRange.SetStart( eBr, 4 ) ;
@@ -501 +437 @@
         return true ;
 }
 
-// Transform a block without a block tag in a valid block (orphan text in the body or td, usually).
-FCKEnterKey.prototype._FixBlock = function( range, isStart, blockTag )
-{
-        // Bookmark the range so we can restore it later.
-        var oBookmark = range.CreateBookmark() ;
-
-        // Collapse the range to the requested ending boundary.
-        range.Collapse( isStart ) ;
-
-        // Expands it to the block contents.
-        range.Expand( 'block_contents' ) ;
-
-        // Create the fixed block.
-        var oFixedBlock = this.Window.document.createElement( blockTag ) ;
-
-        // Move the contents of the temporary range to the fixed block.
-        range.ExtractContents().AppendTo( oFixedBlock ) ;
-        FCKDomTools.TrimNode( oFixedBlock ) ;
-
-        // Insert the fixed block into the DOM.
-        range.InsertNode( oFixedBlock ) ;
-
-        // Move the range back to the bookmarked place.
-        range.MoveToBookmark( oBookmark ) ;
-}
-
-// Appends a bogus <br> at the end of the element, if not yet available.
-FCKEnterKey.prototype._AppendBogusBr = function( element )
-{
-        var eLastChild = element.getElementsByTagName('br') ;
-
-        if ( eLastChild )
-                eLastChild = eLastChild[ eLastChild.legth - 1 ] ;
-
-        if ( !eLastChild || eLastChild.getAttribute( 'type', 2 ) != '_moz' )
-                element.appendChild( FCKTools.CreateBogusBR( this.Window.document ) ) ;
-}
-
 // Recreate the elements tree at the end of the source block, at the beginning
-// of the target block. Eg.: 
+// of the target block. Eg.:
 //      If source = <p><u>Some</u> sample <b><i>text</i></b></p> then target = <p><b><i></i></b></p>
 //      If source = <p><u>Some</u> sample text</p> then target = <p></p>
 FCKEnterKey.prototype._RecreateEndingTree = function( source, target )
@@ -555 +453 @@
         var oBookmark = range.CreateBookmark() ;
 
         FCKListHandler.OutdentListItem( li ) ;
-        
+
         range.MoveToBookmark( oBookmark ) ;
         range.Select() ;
 }
+ No newline at end of file

editor/_source/commandclasses/fck_othercommands.js

@@ -279 +279 @@
         e.innerHTML = '<span style="DISPLAY:none">&nbsp;</span>' ;
 
         var oFakeImage = FCKDocumentProcessor_CreateFakeImage( 'FCK__PageBreak', e ) ;
-        oFakeImage      = FCK.InsertElement( oFakeImage ) ;
+        FCK.InsertElement( oFakeImage ) ;
 }
 
 FCKPageBreakCommand.prototype.GetState = function()
@@ -378 +378 @@
         {
                 return FCK.GetNamedCommandState( 'Paste' ) ;
         }
+} ;
+
+// FCKRuleCommand
+var FCKRuleCommand = function()
+{
+        this.Name = 'Paste' ;
+}
+
+FCKRuleCommand.prototype =
+{
+        Execute : function()
+        {
+                FCK.InsertElement( 'hr' ) ;
+        },
+
+        GetState : function()
+        {
+                return FCK.GetNamedCommandState( 'InsertHorizotalRule' ) ;
+        }
 } ;
+ No newline at end of file

editor/_source/internals/fck.js

@@ -88 +88 @@
 
                 this.EditingArea = new FCKEditingArea( document.getElementById( 'xEditingArea' ) ) ;
                 this.EditingArea.FFSpellChecker = false ;
-                
+
                 // Final setup of the lists lib.
                 FCKListsLib.Setup() ;
 
@@ -314 +314 @@
                 if ( FCK.EditMode == FCK_EDITMODE_WYSIWYG )
                 {
                         html = FCKConfig.ProtectedSource.Protect( html ) ;
-                        
+
                         // Fix for invalid self-closing tags (see #152).
                         html = html.replace( FCKRegexLib.InvalidSelfCloseTags, '$1></$2>' ) ;
-                        
+
                         html = FCK.ProtectEvents( html ) ;
                         html = FCK.ProtectUrls( html ) ;
                         html = FCK.ProtectTags( html ) ;
@@ -331 +331 @@
                                 html = html.replace( FCKRegexLib.EmOpener, '<i$1' ) ;
                                 html = html.replace( FCKRegexLib.EmCloser, '<\/i>' ) ;
                         }
-                        
+
                         this._ForceResetIsDirty = ( resetIsDirty === true ) ;
 
                         var sHtml = '' ;
@@ -429 +429 @@
 
                         // Removes the enter key handler.
                         FCK.EnterKeyHandler = null ;
-                        
+
                         if ( resetIsDirty )
                                 this.ResetIsDirty() ;
 
@@ -569 +569 @@
                 FCK.EditMode = bIsWysiwyg ? FCK_EDITMODE_SOURCE : FCK_EDITMODE_WYSIWYG ;
 
                 FCK.SetHTML( sHtml, !bIsDirty ) ;
-                
+
                 // Set the Focus.
                 FCK.Focus() ;
 
@@ -579 +579 @@
                 return true ;
         },
 
-        CreateElement : function( tag )
+        InsertElement : function( element )
         {
-                var e = FCK.EditorDocument.createElement( tag ) ;
-                return FCK.InsertElementAndGetIt( e ) ;
-        },
+                // The parameter may be a string (element name), so transform it in an element.
+                if ( typeof element == 'string' )
+                        element = this.EditorDocument.createElement( element ) ;
+                
+                var elementName = element.nodeName.toLowerCase() ;
 
-        InsertElementAndGetIt : function( e )
-        {
-                e.setAttribute( 'FCKTempLabel', 'true' ) ;
+                // Create a range for the selection. V3 will have a new selection
+                // object that may internaly supply this feature.
+                var range = new FCKDomRange( this.EditorWindow ) ;
 
-                this.InsertElement( e ) ;
+                if ( FCKListsLib.BlockElements[ elementName ] != null )
+                {
+                        range.SplitBlock() ;
+                        range.InsertNode( element ) ;
+                        
+                        var next = FCKDomTools.GetNextSourceElement( element, false, null, [ 'hr','br','param','img','area','input' ] )
 
-                var aEls = FCK.EditorDocument.getElementsByTagName( e.tagName ) ;
+                        // Be sure that we have something after the new element, so we can move the cursor there.
+                        if ( !next && FCKConfig.EnterMode != 'br')
+                        {
+                                next = this.EditorDocument.body.appendChild( this.EditorDocument.createElement( FCKConfig.EnterMode ) ) ;
+                                
+                                if ( FCKBrowserInfo.IsGecko )
+                                        next.innerHTML = GECKO_BOGUS ;
+                        }
+                        
+                        if ( FCKListsLib.EmptyElements[ elementName ] == null )
+                                range.MoveToElementEditStart( element ) ;
+                        else if ( next )
+                                range.MoveToElementEditStart( next ) ;
+                        else
+                                range.MoveToPosition( element, 4 ) ;
 
-                for ( var i = 0 ; i < aEls.length ; i++ )
-                {
-                        if ( aEls[i].getAttribute( 'FCKTempLabel' ) )
+                        if ( FCKBrowserInfo.IsGecko )
                         {
-                                aEls[i].removeAttribute( 'FCKTempLabel' ) ;
-                                return aEls[i] ;
+                                if ( next ) 
+                                        next.scrollIntoView( false ) ;
+                                element.scrollIntoView( false ) ;
                         }
                 }
-                return null ;
+                else
+                {
+                        // Delete the current selection and insert the node.
+                        range.MoveToSelection() ;
+                        range.DeleteContents() ;
+                        range.InsertNode( element ) ;
+
+                        // Move the selection right after the new element.
+                        // DISCUSSION: Should we select the element instead?
+                        range.SetStart( element, 4 ) ;
+                        range.SetEnd( element, 4 ) ;
+                }
+
+                range.Select() ;
+                range.Release() ;
+
+                // REMOVE IT: The focus should not really be set here. It is up to the
+                // calling code to reset the focus if needed.
+                this.Focus() ;
+
+                return element ;
+        },
+
+        _InsertBlockElement : function( blockElement )
+        {
         }
-
 } ;
 
 FCK.Events      = new FCKEvents( FCK ) ;
+
 // GetHTML is Deprecated : returns the same value as GetXHTML.
 FCK.GetHTML     = FCK.GetXHTML ;
 
+// InsertElementAndGetIt and CreateElement are Deprecated : returns the same value as InsertElement.
+FCK.InsertElementAndGetIt = FCK.CreateElement = FCK.InsertElement ;
+
 // Replace all events attributes (like onclick).
 function _FCK_ProtectEvents_ReplaceTags( tagMatch )
 {
@@ -643 +690 @@
 
         // Listen for keystroke events.
         FCK.KeystrokeHandler.AttachToElement( FCK.EditorDocument ) ;
-        
+
         if ( FCK._ForceResetIsDirty )
                 FCK.ResetIsDirty() ;
-        
+
         // This is a tricky thing for IE. In some cases, even if the cursor is
         // blinking in the editing, the keystroke handler doesn't catch keyboard
         // events. We must activate the editing area to make it work. (#142).

editor/_source/internals/fck_gecko.js

@@ -181 +181 @@
         this.Focus() ;
 }
 
-FCK.InsertElement = function( element )
-{
-        // Deletes the actual selection.
-        var oSel = FCKSelection.Delete() ;
-
-        // Gets the first available range.
-        var oRange = oSel.getRangeAt(0) ;
-
-        // Inserts the element in the range.
-        oRange.insertNode( element ) ;
-
-        // Set the cursor after the inserted fragment.
-        FCKSelection.SelectNode( element ) ;
-        FCKSelection.Collapse( false ) ;
-
-        this.Focus() ;
-}
-
 FCK.PasteAsPlainText = function()
 {
         // TODO: Implement the "Paste as Plain Text" code.

editor/_source/internals/fck_ie.js

@@ -310 +310 @@
         FCK._PasteIsEnabled = true ;
 }
 
-FCK.InsertElement = function( element )
-{
-        FCK.InsertHtml( element.outerHTML ) ;
-}
-
 FCK.GetClipboardHTML = function()
 {
         var oDiv = document.getElementById( '___FCKHiddenDiv' ) ;

editor/_source/internals/fckcommands.js

@@ -69 +69 @@
                 case 'Save'                     : oCommand = new FCKSaveCommand() ; break ;
                 case 'NewPage'          : oCommand = new FCKNewPageCommand() ; break ;
                 case 'PageBreak'        : oCommand = new FCKPageBreakCommand() ; break ;
+                case 'Rule'                     : oCommand = new FCKRuleCommand() ; break ;
 
                 case 'TextColor'        : oCommand = new FCKTextColorCommand('ForeColor') ; break ;
                 case 'BGColor'          : oCommand = new FCKTextColorCommand('BackColor') ; break ;

editor/_source/internals/fcklistslib.js

@@ -31 +31 @@
         BlockElements : { address:1,blockquote:1,center:1,div:1,dl:1,fieldset:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,noscript:1,ol:1,p:1,pre:1,script:1,table:1,ul:1 },
 
         // Block elements that may be filled with   if empty.
-        NonEmptyBlockElements : { p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,address:1,pre:1,ol:1,ul:1,li:1,td:1,th:1 },
+        NonEmptyBlockElements : { p:1,div:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,address:1,pre:1,ol:1,ul:1,li:1,td:1,th:1 },
 
         // Inline elements which MUST have child nodes.
         InlineChildReqElements : { abbr:1,acronym:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,samp:1,small:1,span:1,strong:1,sub:1,sup:1,tt:1,u:1,'var':1 },

editor/_source/internals/fcktoolbaritems.js

@@ -82 +82 @@
                 case 'Smiley'                   : oItem = new FCKToolbarButton( 'Smiley'                , FCKLang.InsertSmileyLbl, FCKLang.InsertSmiley, null, false, true, 41 ) ; break ;
                 case 'PageBreak'                : oItem = new FCKToolbarButton( 'PageBreak'             , FCKLang.PageBreakLbl, FCKLang.PageBreak, null, false, true, 43 ) ; break ;
 
-                case 'Rule'                             : oItem = new FCKToolbarButton( 'InsertHorizontalRule', FCKLang.InsertLineLbl, FCKLang.InsertLine, null, false, true, 40 ) ; break ;
+                case 'Rule'                             : oItem = new FCKToolbarButton( 'Rule'                  , FCKLang.InsertLineLbl, FCKLang.InsertLine, null, false, true, 40 ) ; break ;
 
                 case 'JustifyLeft'              : oItem = new FCKToolbarButton( 'JustifyLeft'   , FCKLang.LeftJustify, null, null, false, true, 30 ) ; break ;
                 case 'JustifyCenter'    : oItem = new FCKToolbarButton( 'JustifyCenter' , FCKLang.CenterJustify, null, null, false, true, 31 ) ; break ;

editor/_source/internals/fcktools.js

@@ -223 +223 @@
         fCloneCreator.prototype = sourceObject ;
         return new fCloneCreator ;
 }
+
+// Appends a bogus <br> at the end of the element, if not yet available.
+FCKTools.AppendBogusBr = function( element )
+{
+        if ( !element )
+                return ;
+
+        var eLastChild = element.getElementsByTagName('br') ;
+
+        if ( eLastChild )
+                eLastChild = eLastChild[ eLastChild.legth - 1 ] ;
+
+        if ( !eLastChild || eLastChild.getAttribute( 'type', 2 ) != '_moz' )
+                element.appendChild( this.CreateBogusBR( this.GetElementDocument( element ) ) ) ;
+}
+ No newline at end of file

editor/_source/internals/fckxhtml_ie.js

@@ -166 +166 @@
         if ( htmlNode.name )
                 FCKXHtml._AppendAttribute( node, 'name', htmlNode.name ) ;
 
-        node = FCKXHtml._AppendChildNodes( node, htmlNode ) ;
+        node = FCKXHtml._AppendChildNodes( node, htmlNode, true ) ;
 
         return node ;
 }

editor/dialog/fck_anchor.html

@@ -114 +114 @@
         if ( !oAnchor )
         {
                 // Nothing was selected, so now just create a normal A
-                oAnchor = oEditor.FCK.CreateElement( 'a' ) ;
+                oAnchor = oEditor.FCK.InsertElement( 'a' ) ;
         }
         else
         {

editor/dialog/fck_button.html

@@ -61 +61 @@
         {
                 oActiveEl = oEditor.FCK.EditorDocument.createElement( 'INPUT' ) ;
                 oActiveEl.type = GetE('txtType').value ;
-                oActiveEl = oEditor.FCK.InsertElementAndGetIt( oActiveEl ) ;
+                oActiveEl = oEditor.FCK.InsertElement( oActiveEl ) ;
         }
 
         oActiveEl.name = GetE('txtName').value ;

editor/dialog/fck_checkbox.html

@@ -59 +59 @@
         {
                 oActiveEl = oEditor.FCK.EditorDocument.createElement( 'INPUT' ) ;
                 oActiveEl.type = 'checkbox' ;
-                oActiveEl = oEditor.FCK.InsertElementAndGetIt( oActiveEl ) ;
+                oActiveEl = oEditor.FCK.InsertElement( oActiveEl ) ;
         }
 
         if ( GetE('txtName').value.length > 0 )

editor/dialog/fck_flash/fck_flash.js

@@ -135 +135 @@
         {
                 oFakeImage      = oEditor.FCKDocumentProcessor_CreateFakeImage( 'FCK__Flash', oEmbed ) ;
                 oFakeImage.setAttribute( '_fckflash', 'true', 0 ) ;
-                oFakeImage      = FCK.InsertElementAndGetIt( oFakeImage ) ;
+                oFakeImage      = FCK.InsertElement( oFakeImage ) ;
         }
         else
                 oEditor.FCKUndo.SaveUndoStep() ;

editor/dialog/fck_form.html

@@ -1 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
@@ -57 +57 @@
 {
         if ( !oActiveEl )
         {
-                oActiveEl = oEditor.FCK.EditorDocument.createElement( 'FORM' ) ;
-                oActiveEl = oEditor.FCK.InsertElementAndGetIt( oActiveEl ) ;
-                oActiveEl.innerHTML = '&nbsp;' ;
+                oActiveEl = oEditor.FCK.InsertElement( 'form' ) ;
+
+                if ( oEditor.FCKBrowserInfo.IsGeckoLike )
+                        oActiveEl.innerHTML = GECKO_BOGUS ;
         }
 
         oActiveEl.name = GetE('txtName').value ;
-        SetAttribute( oActiveEl, 'action'       , GetE('txtAction').value ) ;
+        SetAttribute( oActiveEl, 'action', GetE('txtAction').value ) ;
         oActiveEl.method = GetE('txtMethod').value ;
 
         return true ;

editor/dialog/fck_hiddenfield.html

@@ -79 +79 @@
         {
                 oFakeImage      = oEditor.FCKDocumentProcessor_CreateFakeImage( 'FCK__InputHidden', oActiveEl ) ;
                 oFakeImage.setAttribute( '_fckinputhidden', 'true', 0 ) ;
-                oFakeImage      = FCK.InsertElementAndGetIt( oFakeImage ) ;
+                oFakeImage      = FCK.InsertElement( oFakeImage ) ;
         }
         else
                 oEditor.FCKUndo.SaveUndoStep() ;

editor/dialog/fck_image/fck_image.js

@@ -220 +220 @@
         {
                 if ( bImageButton )
                 {
-                        oImage = FCK.EditorDocument.createElement( 'INPUT' ) ;
+                        oImage = FCK.EditorDocument.createElement( 'input' ) ;
                         oImage.type = 'image' ;
-                        oImage = FCK.InsertElementAndGetIt( oImage ) ;
+                        oImage = FCK.InsertElement( oImage ) ;
                 }
                 else
-                        oImage = FCK.CreateElement( 'IMG' ) ;
+                        oImage = FCK.InsertElement( 'img' ) ;
         }
         else
                 oEditor.FCKUndo.SaveUndoStep() ;

editor/dialog/fck_link/fck_link.js

@@ -534 +534 @@
                 }
 
                 // Create a new (empty) anchor.
-                oLink = oEditor.FCK.CreateElement( 'a' ) ;
+                oLink = oEditor.FCK.InsertElement( 'a' ) ;
         }
 
         oEditor.FCKUndo.SaveUndoStep() ;

editor/dialog/fck_radiobutton.html

@@ -59 +59 @@
         {
                 oActiveEl = oEditor.FCK.EditorDocument.createElement( 'INPUT' ) ;
                 oActiveEl.type = 'radio' ;
-                oActiveEl = oEditor.FCK.InsertElementAndGetIt( oActiveEl ) ;
+                oActiveEl = oEditor.FCK.InsertElement( oActiveEl ) ;
         }
 
         if ( GetE('txtName').value.length > 0 )

editor/dialog/fck_select.html

@@ -78 +78 @@
                 sSize = '' ;
 
         if ( !oActiveEl )
-        {
-                oActiveEl = oEditor.FCK.EditorDocument.createElement( 'SELECT' ) ;
-                oActiveEl = oEditor.FCK.InsertElementAndGetIt( oActiveEl ) ;
-        }
+                oActiveEl = oEditor.FCK.InsertElement( 'select' ) ;
 
         SetAttribute( oActiveEl, 'name' , GetE('txtName').value ) ;
         SetAttribute( oActiveEl, 'size' , sSize ) ;

editor/dialog/fck_smiley.html

@@ -45 +45 @@
 
 function InsertSmiley( url )
 {
-        var oImg = oEditor.FCK.CreateElement( 'IMG' ) ;
+        var oImg = oEditor.FCK.InsertElement( 'img' ) ;
         oImg.src = url ;
         oImg.setAttribute( '_fcksavedurl', url ) ;
 

editor/dialog/fck_textarea.html

@@ -56 +56 @@
 function Ok()
 {
         if ( !oActiveEl )
-        {
-                oActiveEl = oEditor.FCK.EditorDocument.createElement( 'TEXTAREA' ) ;
-                oActiveEl = oEditor.FCK.InsertElementAndGetIt( oActiveEl ) ;
-        }
+                oActiveEl = oEditor.FCK.InsertElement( 'textarea' ) ;
 
         oActiveEl.name = GetE('txtName').value ;
         SetAttribute( oActiveEl, 'cols', GetE('txtCols').value ) ;

editor/dialog/fck_textfield.html

@@ -76 +76 @@
         {
                 oActiveEl = oEditor.FCK.EditorDocument.createElement( 'INPUT' ) ;
                 oActiveEl.type = GetE('txtType').value ;
-                oActiveEl = oEditor.FCK.InsertElementAndGetIt( oActiveEl ) ;
+                oActiveEl = oEditor.FCK.InsertElement( oActiveEl ) ;
         }
 
         oActiveEl.name = GetE('txtName').value ;

editor/plugins/placeholder/fckplugin.js

@@ -37 +37 @@
 // Add a new placeholder at the actual selection.
 FCKPlaceholders.Add = function( name )
 {
-        var oSpan = FCK.CreateElement( 'SPAN' ) ;
+        var oSpan = FCK.InsertElement( 'span' ) ;
         this.SetupSpan( oSpan, name ) ;
 }