Index: /FCKeditor/branches/versions/2.6.x/_dev/browserbugs/firefox/contenteditable.html =================================================================== --- /FCKeditor/branches/versions/2.6.x/_dev/browserbugs/firefox/contenteditable.html (revision 2911) +++ /FCKeditor/branches/versions/2.6.x/_dev/browserbugs/firefox/contenteditable.html (revision 2911) @@ -0,0 +1,24 @@ + + + + + + + +
+

+ This is some sample text. The page has document.designMode = 'on' +

+

+ This is some sample text. This paragraph has contentEditable="false", so it shouldn't be editable. +

+
+ + Index: /FCKeditor/branches/versions/2.6.x/_dev/build_release.bat =================================================================== --- /FCKeditor/branches/versions/2.6.x/_dev/build_release.bat (revision 2910) +++ /FCKeditor/branches/versions/2.6.x/_dev/build_release.bat (revision 2911) @@ -1,3 +1,3 @@ -@ECHO OFF +@ECHO OFF :: @@ -26,5 +26,5 @@ :: Update this variable for each new release. -SET RELEASER_VERSION=2.6.3 +SET RELEASER_VERSION=2.6.4 Beta CLS Index: /FCKeditor/branches/versions/2.6.x/_test/automated/tests/fckdataprocessor.html =================================================================== --- /FCKeditor/branches/versions/2.6.x/_test/automated/tests/fckdataprocessor.html (revision 2910) +++ /FCKeditor/branches/versions/2.6.x/_test/automated/tests/fckdataprocessor.html (revision 2911) @@ -165,4 +165,13 @@ } +function test_ConvertToDataFormat_Character_Transform() +{ + var dataProcessor = new FCKDataProcessor() ; + + assertEquals( + '

<<GetText(Edit)>>

', + dataProcessor.ConvertToDataFormat( document.getElementById('xDiv3'), true, true ) ) ; +} + @@ -170,4 +179,5 @@

This is a test.

Another paragraph.

 

+

<<GetText(Edit)>>

Index: /FCKeditor/branches/versions/2.6.x/_whatsnew.html =================================================================== --- /FCKeditor/branches/versions/2.6.x/_whatsnew.html (revision 2910) +++ /FCKeditor/branches/versions/2.6.x/_whatsnew.html (revision 2911) @@ -34,131 +34,112 @@ FCKeditor ChangeLog - What's New?

- Version 2.6.3

-

- Fixed Bugs:

- -

- This version has been sponsored by Data Illusion - survey software solutions.

-

- Version 2.6.3 Beta

+ Version 2.6.4 Beta

New Features and Improvements:

Fixed Bugs:

Index: /FCKeditor/branches/versions/2.6.x/_whatsnew_history.html =================================================================== --- /FCKeditor/branches/versions/2.6.x/_whatsnew_history.html (revision 2910) +++ /FCKeditor/branches/versions/2.6.x/_whatsnew_history.html (revision 2911) @@ -33,4 +33,133 @@

FCKeditor ChangeLog - What's New?

+

+ Version 2.6.3

+

+ Fixed Bugs:

+ +

+ This version has been sponsored by Data Illusion + survey software solutions.

+

+ Version 2.6.3 Beta

+

+ New Features and Improvements:

+ +

+ Fixed Bugs:

+

Version 2.6.2

Index: /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckdomrangeiterator.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckdomrangeiterator.js (revision 2910) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckdomrangeiterator.js (revision 2911) @@ -137,5 +137,5 @@ // point. (#1717) if ( nodeName != 'br' ) - this._NextNode = FCKDomTools.GetNextSourceNode( currentNode, true, null, lastNode ) ; + this._NextNode = FCKDomTools.GetNextSourceNode( currentNode, true, null, lastNode ) || currentNode ; } Index: /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckenterkey.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckenterkey.js (revision 2910) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckenterkey.js (revision 2911) @@ -537,5 +537,25 @@ if ( FCKBrowserInfo.IsGeckoLike ) - FCKDomTools.ScrollIntoView( eNextBlock || eNewBlock, false ) ; + { + if ( eNextBlock ) + { + // If we have split the block, adds a temporary span at the + // range position and scroll relatively to it. + var tmpNode = this.Window.document.createElement( 'span' ) ; + + // We need some content for Safari. + tmpNode.innerHTML = ' '; + + oRange.InsertNode( tmpNode ) ; + FCKDomTools.ScrollIntoView( tmpNode, false ) ; + oRange.DeleteContents() ; + } + else + { + // We may use the above scroll logic for the new block case + // too, but it gives some weird result with Opera. + FCKDomTools.ScrollIntoView( eNextBlock || eNewBlock, false ) ; + } + } oRange.Select() ; Index: /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckpanel.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckpanel.js (revision 2910) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckpanel.js (revision 2911) @@ -131,4 +131,58 @@ } +// Workaround for IE7 problem. See #1982 +// Submenus are restricted to the size of its parent, so we increase it as needed. +// Returns true if the panel has been repositioned +FCKPanel.prototype.ResizeForSubpanel = function( panel, width, height ) +{ + if ( !FCKBrowserInfo.IsIE7 ) + return false ; + + if ( !this._Popup.isOpen ) + { + this.Subpanel = null ; + return false ; + } + + // If we are resetting the extra space + if ( width == 0 && height == 0 ) + { + // Another subpanel is being shown, so we must not shrink back + if (this.Subpanel !== panel) + return false ; + + // Reset values. + // We leave the IncreasedY untouched to avoid vertical movement of the + // menu if the submenu is higher than the main menu. + this.Subpanel = null ; + this.IncreasedX = 0 ; + } + else + { + this.Subpanel = panel ; + // If the panel has already been increased enough, get out + if ( ( this.IncreasedX >= width ) && ( this.IncreasedY >= height ) ) + return false ; + + this.IncreasedX = Math.max( this.IncreasedX, width ) ; + this.IncreasedY = Math.max( this.IncreasedY, height ) ; + } + + var x = this.ShowRect.x ; + var w = this.IncreasedX ; + if ( this.IsRTL ) + x = x - w ; + + // Horizontally increase as needed (sum of widths). + // Vertically, use only the maximum of this menu or the submenu + var finalWidth = this.ShowRect.w + w ; + var finalHeight = Math.max( this.ShowRect.h, this.IncreasedY ) ; + if ( this.ParentPanel ) + this.ParentPanel.ResizeForSubpanel( this, finalWidth, finalHeight ) ; + this._Popup.show( x, this.ShowRect.y, finalWidth, finalHeight, this.RelativeElement ) ; + + return this.IsRTL ; +} + FCKPanel.prototype.Show = function( x, y, relElement, width, height ) { @@ -153,4 +207,14 @@ iMainWidth = eMainNode.offsetWidth ; + if ( FCKBrowserInfo.IsIE7 ) + { + if (this.ParentPanel && this.ParentPanel.ResizeForSubpanel(this, iMainWidth, eMainNode.offsetHeight) ) + { + // As the parent has moved, allow the browser to update its internal data, so the new position is correct. + FCKTools.RunFunction( this.Show, this, [x, y, relElement] ) ; + return ; + } + } + if ( this.IsRTL ) { @@ -159,4 +223,13 @@ else if ( relElement ) x = ( x * -1 ) + relElement.offsetWidth - iMainWidth ; + } + + if ( FCKBrowserInfo.IsIE7 ) + { + // Store the values that will be used by the ResizeForSubpanel function + this.ShowRect = {x:x, y:y, w:iMainWidth, h:eMainNode.offsetHeight} ; + this.IncreasedX = 0 ; + this.IncreasedY = 0 ; + this.RelativeElement = relElement ; } @@ -376,4 +449,7 @@ this._Timer = null ; + if (this._Popup && this.ParentPanel && !forceHide) + this.ParentPanel.ResizeForSubpanel(this, 0, 0) ; + FCKTools.RunFunction( this.OnHide, this ) ; } @@ -386,3 +462,4 @@ this.Document = null ; this.MainNode = null ; -} + this.RelativeElement = null ; +} Index: /FCKeditor/branches/versions/2.6.x/editor/_source/commandclasses/fck_othercommands.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/commandclasses/fck_othercommands.js (revision 2910) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/commandclasses/fck_othercommands.js (revision 2911) @@ -312,5 +312,5 @@ } -FCKVisitLinkCommand = function() +var FCKVisitLinkCommand = function() { this.Name = 'VisitLink'; Index: /FCKeditor/branches/versions/2.6.x/editor/_source/commandclasses/fckblockquotecommand.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/commandclasses/fckblockquotecommand.js (revision 2910) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/commandclasses/fckblockquotecommand.js (revision 2911) @@ -84,5 +84,4 @@ if ( state == FCK_TRISTATE_OFF ) { - iterator.EnforceRealBlocks = true ; var paragraphs = [] ; while ( ( block = iterator.GetNextParagraph() ) ) @@ -110,4 +109,11 @@ commonParent = FCKDomTools.GetCommonParents( block.parentNode, commonParent ).pop() ; } + + // The common parent must not be the following tags: table, tbody, tr, ol, ul. + while ( commonParent.nodeName.IEquals( 'table', 'tbody', 'tr', 'ol', 'ul' ) ) + commonParent = commonParent.parentNode ; + + // Reconstruct the block list to be processed such that all resulting blocks + // satisfy parentNode == commonParent. var lastBlock = null ; while ( paragraphs.length > 0 ) @@ -151,4 +157,5 @@ { var moveOutNodes = [] ; + var elementMarkers = {} ; while ( ( block = iterator.GetNextParagraph() ) ) { @@ -166,9 +173,25 @@ } - if ( bqParent && bqChild ) + // Remember the blocks that were recorded down in the moveOutNodes array + // to prevent duplicates. + if ( bqParent && bqChild && !bqChild._fckblockquotemoveout ) + { moveOutNodes.push( bqChild ) ; - } + FCKDomTools.SetElementMarker( elementMarkers, bqChild, '_fckblockquotemoveout', true ) ; + } + } + FCKDomTools.ClearAllMarkers( elementMarkers ) ; var movedNodes = [] ; + var processedBlockquoteBlocks = [], elementMarkers = {} ; + var noBlockLeft = function( bqBlock ) + { + for ( var i = 0 ; i < bqBlock.childNodes.length ; i++ ) + { + if ( FCKListsLib.BlockElements[ bqBlock.childNodes[i].nodeName.toLowerCase() ] ) + return false ; + } + return true ; + } ; while ( moveOutNodes.length > 0 ) { @@ -179,20 +202,28 @@ // Otherwise, split the blockquote node and move the paragraph in between the two blockquote nodes. if ( node == node.parentNode.firstChild ) - { bqBlock.parentNode.insertBefore( bqBlock.removeChild( node ), bqBlock ) ; - if ( ! bqBlock.firstChild ) - bqBlock.parentNode.removeChild( bqBlock ) ; - } else if ( node == node.parentNode.lastChild ) - { bqBlock.parentNode.insertBefore( bqBlock.removeChild( node ), bqBlock.nextSibling ) ; - if ( ! bqBlock.firstChild ) - bqBlock.parentNode.removeChild( bqBlock ) ; - } else FCKDomTools.BreakParent( node, node.parentNode, range ) ; + // Remember the blockquote node so we can clear it later (if it becomes empty). + if ( !bqBlock._fckbqprocessed ) + { + processedBlockquoteBlocks.push( bqBlock ) ; + FCKDomTools.SetElementMarker( elementMarkers, bqBlock, '_fckbqprocessed', true ); + } + movedNodes.push( node ) ; } + + // Clear blockquote nodes that have become empty. + for ( var i = processedBlockquoteBlocks.length - 1 ; i >= 0 ; i-- ) + { + var bqBlock = processedBlockquoteBlocks[i] ; + if ( noBlockLeft( bqBlock ) ) + FCKDomTools.RemoveNode( bqBlock ) ; + } + FCKDomTools.ClearAllMarkers( elementMarkers ) ; if ( FCKConfig.EnterMode.IEquals( 'br' ) ) Index: /FCKeditor/branches/versions/2.6.x/editor/_source/commandclasses/fckfitwindow.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/commandclasses/fckfitwindow.js (revision 2910) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/commandclasses/fckfitwindow.js (revision 2911) @@ -39,7 +39,17 @@ // Save the current selection and scroll position. - var oRange = new FCKDomRange( FCK.EditorWindow ) ; - oRange.MoveToSelection() ; - var oEditorScrollPos = FCKTools.GetScrollPosition( FCK.EditorWindow ) ; + var oRange, oEditorScrollPos ; + if ( FCK.EditMode == FCK_EDITMODE_WYSIWYG ) + { + oRange = new FCKDomRange( FCK.EditorWindow ) ; + oRange.MoveToSelection() ; + oEditorScrollPos = FCKTools.GetScrollPosition( FCK.EditorWindow ) ; + } + else + { + var eTextarea = FCK.EditingArea.Textarea ; + oRange = !FCKBrowserInfo.IsIE && [ eTextarea.selectionStart, eTextarea.selectionEnd ] ; + oEditorScrollPos = [ eTextarea.scrollLeft, eTextarea.scrollTop ] ; + } // No original style properties known? Go fullscreen. @@ -168,6 +178,19 @@ // Restore the selection and scroll position of inside the document. - oRange.Select() ; - FCK.EditorWindow.scrollTo( oEditorScrollPos.X, oEditorScrollPos.Y ) ; + if ( FCK.EditMode == FCK_EDITMODE_WYSIWYG ) + { + oRange.Select() ; + FCK.EditorWindow.scrollTo( oEditorScrollPos.X, oEditorScrollPos.Y ) ; + } + else + { + if ( !FCKBrowserInfo.IsIE ) + { + eTextarea.selectionStart = oRange[0] ; + eTextarea.selectionEnd = oRange[1] ; + } + eTextarea.scrollLeft = oEditorScrollPos[0] ; + eTextarea.scrollTop = oEditorScrollPos[1] ; + } } Index: /FCKeditor/branches/versions/2.6.x/editor/_source/commandclasses/fckshowblocks.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/commandclasses/fckshowblocks.js (revision 2910) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/commandclasses/fckshowblocks.js (revision 2911) @@ -57,7 +57,10 @@ { var focus = FCK.EditorWindow.getSelection().focusNode ; - if ( focus.nodeType != 1 ) - focus = focus.parentNode ; - FCKDomTools.ScrollIntoView( focus, false ) ; + if ( focus ) + { + if ( focus.nodeType != 1 ) + focus = focus.parentNode ; + FCKDomTools.ScrollIntoView( focus, false ) ; + } } Index: /FCKeditor/branches/versions/2.6.x/editor/_source/commandclasses/fckspellcheckcommand_gecko.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/commandclasses/fckspellcheckcommand_gecko.js (revision 2910) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/commandclasses/fckspellcheckcommand_gecko.js (revision 2911) @@ -26,10 +26,18 @@ { this.Name = 'SpellCheck' ; - this.IsEnabled = ( FCKConfig.SpellChecker == 'SpellerPages' ) ; + this.IsEnabled = ( FCKConfig.SpellChecker != 'ieSpell' ) ; } FCKSpellCheckCommand.prototype.Execute = function() { - FCKDialog.OpenDialog( 'FCKDialog_SpellCheck', 'Spell Check', 'dialog/fck_spellerpages.html', 440, 480 ) ; + switch ( FCKConfig.SpellChecker ) + { + case 'SpellerPages' : + FCKDialog.OpenDialog( 'FCKDialog_SpellCheck', 'Spell Check', 'dialog/fck_spellerpages.html', 440, 480 ) ; + break; + + case 'WSC' : + FCKDialog.OpenDialog( 'FCKDialog_SpellCheck', 'Spell Check', 'wsc/w.html', 530, 480 ) ; + } } Index: /FCKeditor/branches/versions/2.6.x/editor/_source/commandclasses/fckspellcheckcommand_ie.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/commandclasses/fckspellcheckcommand_ie.js (revision 2910) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/commandclasses/fckspellcheckcommand_ie.js (revision 2911) @@ -26,5 +26,5 @@ { this.Name = 'SpellCheck' ; - this.IsEnabled = ( FCKConfig.SpellChecker == 'ieSpell' || FCKConfig.SpellChecker == 'SpellerPages' ) ; + this.IsEnabled = true ; } @@ -40,4 +40,7 @@ FCKDialog.OpenDialog( 'FCKDialog_SpellCheck', 'Spell Check', 'dialog/fck_spellerpages.html', 440, 480 ) ; break ; + + case 'WSC' : + FCKDialog.OpenDialog( 'FCKDialog_SpellCheck', 'Spell Check', 'wsc/w.html', 530, 480 ) ; } } Index: /FCKeditor/branches/versions/2.6.x/editor/_source/fckeditorapi.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/fckeditorapi.js (revision 2910) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/fckeditorapi.js (revision 2911) @@ -43,5 +43,5 @@ 'Version : "[Development]",' + 'VersionBuild : "[DEV]",' + - 'Instances : new Object(),' + + 'Instances : window.FCKeditorAPI && window.FCKeditorAPI.Instances || {},' + 'GetInstance : function( name )' + @@ -61,5 +61,5 @@ '},' + - '_FunctionQueue : {' + + '_FunctionQueue : window.FCKeditorAPI && window.FCKeditorAPI._FunctionQueue || {' + 'Functions : new Array(),' + 'IsRunning : false,' + @@ -118,6 +118,7 @@ else if ( FCKBrowserInfo.IsSafari ) { - // oParentWindow.eval in Safari and Gran Paradiso executes in the calling window - // environment, instead of the parent one. The following should make it work. + // oParentWindow.eval in Safari executes in the calling window + // environment, instead of the parent one. The following should + // make it work. var oParentDocument = oParentWindow.document ; var eScript = oParentDocument.createElement('script') ; Index: /FCKeditor/branches/versions/2.6.x/editor/_source/fckjscoreextensions.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/fckjscoreextensions.js (revision 2910) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/fckjscoreextensions.js (revision 2911) @@ -149,11 +149,4 @@ } -Array.prototype.AddItem = function( item ) -{ - var i = this.length ; - this[ i ] = item ; - return i ; -} - Array.prototype.IndexOf = function( value ) { Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck.js (revision 2910) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck.js (revision 2911) @@ -410,5 +410,9 @@ } - FCKTempBin.Reset(); + FCKTempBin.Reset() ; + + // Bug #2469: SelectionData.createRange becomes undefined after the editor + // iframe is changed by FCK.SetData(). + FCK.Selection.Release() ; if ( FCK.EditMode == FCK_EDITMODE_WYSIWYG ) Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck_contextmenu.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck_contextmenu.js (revision 2910) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck_contextmenu.js (revision 2911) @@ -342,5 +342,8 @@ function FCK_ContextMenu_OnItemClick( item ) { - FCK.Focus() ; + // IE might work incorrectly if we refocus the editor #798 + if ( !FCKBrowserInfo.IsIE ) + FCK.Focus() ; + FCKCommands.GetCommand( item.Name ).Execute( item.CustomData ) ; } Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck_gecko.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck_gecko.js (revision 2910) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck_gecko.js (revision 2911) @@ -230,7 +230,6 @@ else if ( FCKBrowserInfo.IsSafari ) { - var cancelHandler = function( evt ){ if ( ! FCK.MouseDownFlag ) evt.returnValue = false ; } - this.EditorDocument.addEventListener( 'dragenter', cancelHandler, true ) ; - this.EditorDocument.addEventListener( 'dragover', cancelHandler, true ) ; + this.EditorDocument.addEventListener( 'dragover', function ( evt ) + { if ( !FCK.MouseDownFlag && FCK.Config.ForcePasteAsPlainText ) evt.returnValue = false ; }, true ) ; this.EditorDocument.addEventListener( 'drop', this._ExecDrop, true ) ; this.EditorDocument.addEventListener( 'mousedown', @@ -323,5 +322,10 @@ FCK.ExecuteNamedCommand( 'Paste', null, true ) ; } - catch (e) { FCKDialog.OpenDialog( 'FCKDialog_Paste', FCKLang.Paste, 'dialog/fck_paste.html', 400, 330, 'Security' ) ; } + catch (e) { + if ( FCKConfig.ForcePasteAsPlainText ) + FCK.PasteAsPlainText() ; + else + FCKDialog.OpenDialog( 'FCKDialog_Paste', FCKLang.Paste, 'dialog/fck_paste.html', 400, 330, 'Security' ) ; + } break ; default : Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck_ie.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck_ie.js (revision 2910) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck_ie.js (revision 2911) @@ -137,5 +137,5 @@ this.EditorDocument.attachEvent("ondblclick", Doc_OnDblClick ) ; - this.EditorDocument.attachEvent("onbeforedeactivate", function(){ FCKSelection.Save( true ) ; } ) ; + this.EditorDocument.attachEvent("onbeforedeactivate", function(){ FCKSelection.Save() ; } ) ; // Catch cursor selection changes. Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckcodeformatter.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckcodeformatter.js (revision 2910) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckcodeformatter.js (revision 2911) @@ -29,6 +29,6 @@ // Regex for line breaks. - oRegex.BlocksOpener = /\<(P|DIV|H1|H2|H3|H4|H5|H6|ADDRESS|PRE|OL|UL|LI|TITLE|META|LINK|BASE|SCRIPT|LINK|TD|TH|AREA|OPTION)[^\>]*\>/gi ; - oRegex.BlocksCloser = /\<\/(P|DIV|H1|H2|H3|H4|H5|H6|ADDRESS|PRE|OL|UL|LI|TITLE|META|LINK|BASE|SCRIPT|LINK|TD|TH|AREA|OPTION)[^\>]*\>/gi ; + oRegex.BlocksOpener = /\<(P|DIV|H1|H2|H3|H4|H5|H6|ADDRESS|PRE|OL|UL|LI|DL|DT|DD|TITLE|META|LINK|BASE|SCRIPT|LINK|TD|TH|AREA|OPTION)[^\>]*\>/gi ; + oRegex.BlocksCloser = /\<\/(P|DIV|H1|H2|H3|H4|H5|H6|ADDRESS|PRE|OL|UL|LI|DL|DT|DD|TITLE|META|LINK|BASE|SCRIPT|LINK|TD|TH|AREA|OPTION)[^\>]*\>/gi ; oRegex.NewLineTags = /\<(BR|HR)[^\>]*\>/gi ; @@ -39,6 +39,6 @@ // Regex for indentation. - oRegex.IncreaseIndent = /^\<(HTML|HEAD|BODY|FORM|TABLE|TBODY|THEAD|TR|UL|OL)[ \/\>]/i ; - oRegex.DecreaseIndent = /^\<\/(HTML|HEAD|BODY|FORM|TABLE|TBODY|THEAD|TR|UL|OL)[ \>]/i ; + oRegex.IncreaseIndent = /^\<(HTML|HEAD|BODY|FORM|TABLE|TBODY|THEAD|TR|UL|OL|DL)[ \/\>]/i ; + oRegex.DecreaseIndent = /^\<\/(HTML|HEAD|BODY|FORM|TABLE|TBODY|THEAD|TR|UL|OL|DL)[ \>]/i ; oRegex.FormatIndentatorRemove = new RegExp( '^' + FCKConfig.FormatIndentator ) ; @@ -48,5 +48,5 @@ FCKCodeFormatter._ProtectData = function( outer, opener, data, closer ) { - return opener + '___FCKpd___' + FCKCodeFormatter.ProtectedData.AddItem( data ) + closer ; + return opener + '___FCKpd___' + ( FCKCodeFormatter.ProtectedData.push( data ) - 1 ) + closer ; } Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckconfig.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckconfig.js (revision 2910) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckconfig.js (revision 2911) @@ -155,5 +155,5 @@ FCKConfig.Plugins.Add = function( name, langs, path ) { - FCKConfig.Plugins.Items.AddItem( [name, langs, path] ) ; + FCKConfig.Plugins.Items.push( [name, langs, path] ) ; } @@ -181,5 +181,5 @@ FCKConfig.ProtectedSource.Add = function( regexPattern ) { - this.RegexEntries.AddItem( regexPattern ) ; + this.RegexEntries.push( regexPattern ) ; } Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckdebug.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckdebug.js (revision 2910) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckdebug.js (revision 2911) @@ -33,5 +33,5 @@ try { - this._GetWindow().Output( message, color ) ; + this._GetWindow().Output( message, color, noParse ) ; } catch ( e ) {} // Ignore errors Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckdialog.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckdialog.js (revision 2910) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckdialog.js (revision 2911) @@ -95,5 +95,5 @@ } - FCK.ToolbarSet.CurrentInstance.Selection.Save() ; + FCK.ToolbarSet.CurrentInstance.Selection.Save( true ) ; // Calculate the dialog position, centering it on the screen. Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckdocumentprocessor.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckdocumentprocessor.js (revision 2910) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckdocumentprocessor.js (revision 2911) @@ -28,5 +28,5 @@ { var oNewItem = new Object() ; - this._Items.AddItem( oNewItem ) ; + this._Items.push( oNewItem ) ; return oNewItem ; } @@ -123,5 +123,5 @@ // EMBED and OBJECT tags. -FCKEmbedAndObjectProcessor = (function() +var FCKEmbedAndObjectProcessor = (function() { var customProcessors = [] ; Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fcklanguagemanager.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fcklanguagemanager.js (revision 2910) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fcklanguagemanager.js (revision 2911) @@ -56,4 +56,5 @@ hr : 'Croatian', hu : 'Hungarian', + is : 'Icelandic', it : 'Italian', ja : 'Japanese', Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckselection_ie.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckselection_ie.js (revision 2910) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckselection_ie.js (revision 2911) @@ -156,4 +156,5 @@ // The "nodeTagName" parameter must be UPPER CASE. +// It can be also an array of names FCKSelection.MoveToAncestorNode = function( nodeTagName ) { @@ -181,5 +182,5 @@ } - while ( oNode && oNode.nodeName != nodeTagName ) + while ( oNode && !oNode.nodeName.Equals( nodeTagName ) ) oNode = oNode.parentNode ; @@ -210,10 +211,6 @@ } -FCKSelection.Save = function( noFocus ) -{ - // Ensures the editor has the selection focus. (#1801) - if ( !noFocus ) - FCK.Focus() ; - +FCKSelection.Save = function( lock ) +{ var editorDocument = FCK.EditorDocument ; @@ -221,4 +218,9 @@ return ; + // Avoid saving again a selection while a dialog is open #2616 + if ( this.locked ) + return ; + this.locked = !!lock ; + var selection = editorDocument.selection ; var range ; @@ -226,5 +228,10 @@ if ( selection ) { - range = selection.createRange() ; + // The call might fail if the document doesn't have the focus (#1801), + // but we don't want to modify the current selection (#2495) with a call to FCK.Focus() ; + try { + range = selection.createRange() ; + } + catch(e) {} // Ensure that the range comes from the editor document. @@ -276,4 +283,5 @@ FCKSelection.Release = function() { + this.locked = false ; delete this.SelectionData ; } Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fcktablehandler.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fcktablehandler.js (revision 2910) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fcktablehandler.js (revision 2911) @@ -53,5 +53,5 @@ for ( var i = 0; i < aCells.length; i++ ) { - var oRow = FCKTools.GetElementAscensor( aCells[i],'TR' ) ; + var oRow = aCells[i].parentNode ; aRowsToDelete[oRow.rowIndex] = oRow ; } @@ -119,5 +119,5 @@ var iIndex = oCell.cellIndex ; - // Loop throw all rows available in the table. + // Loop through all rows available in the table. for ( var i = 0 ; i < oTable.rows.length ; i++ ) { @@ -125,5 +125,5 @@ var oRow = oTable.rows[i] ; - // If the row doens't have enough cells, ignore it. + // If the row doesn't have enough cells, ignore it. if ( oRow.cells.length < ( iIndex + 1 ) ) continue ; @@ -137,10 +137,5 @@ var oBaseCell = oRow.cells[iIndex] ; - if ( insertBefore ) - oRow.insertBefore( oCell, oBaseCell ) ; - else if ( oBaseCell.nextSibling ) - oRow.insertBefore( oCell, oBaseCell.nextSibling ) ; - else - oRow.appendChild( oCell ) ; + oRow.insertBefore( oCell, ( insertBefore ? oBaseCell : oBaseCell.nextSibling ) ) ; } } @@ -219,5 +214,5 @@ { // Delete the entire row. - FCKTableHandler.DeleteRows( FCKTools.GetElementAscensor( cell, 'TR' ) ) ; + FCKTableHandler.DeleteRows( cell.parentNode ) ; return ; } @@ -247,8 +242,5 @@ for ( var i = 0 ; i < cells.length ; i++ ) { - if ( FCKBrowserInfo.IsIE ) - cells[i].removeAttribute( label ) ; - else - delete cells[i][label] ; + FCKDomTools.ClearElementJSProperty(cells[i], label ) ; } } @@ -299,5 +291,5 @@ this._MarkCells( cells, '_CellSelected' ) ; - var tableMap = this._CreateTableMap( cells[0].parentNode.parentNode ) ; + var tableMap = this._CreateTableMap( cells[0] ) ; var rowIdx = cells[0].parentNode.rowIndex ; var colIdx = this._GetCellIndexSpan( tableMap, rowIdx, cells[0] ) ; @@ -358,5 +350,5 @@ // Because the checking is already done by FCKTableCommand. var refCell = cells[0] ; - var tableMap = this._CreateTableMap( refCell.parentNode.parentNode ) ; + var tableMap = this._CreateTableMap( refCell ) ; var rowIdx = refCell.parentNode.rowIndex ; var colIdx = this._GetCellIndexSpan( tableMap, rowIdx, refCell ) ; @@ -386,10 +378,10 @@ } if ( rowChildNodesCount > 0 ) - cellContents.appendChild( FCKTools.GetElementDocument( refCell ).createElement( 'br' ) ) ; + cellContents.appendChild( FCK.EditorDocument.createElement( 'br' ) ) ; } this._ReplaceCellsByMarker( tableMap, '_SelectedCells', refCell ) ; this._UnmarkCells( cells, '_SelectedCells' ) ; - this._InstallTableMap( tableMap, refCell.parentNode.parentNode ) ; + this._InstallTableMap( tableMap, refCell.parentNode.parentNode.parentNode ) ; refCell.appendChild( cellContents ) ; @@ -417,5 +409,5 @@ this._MarkCells( [nextCell], '_Replace' ) ; this._ReplaceCellsByMarker( tableMap, '_Replace', refCell ) ; - this._InstallTableMap( tableMap, refCell.parentNode.parentNode ) ; + this._InstallTableMap( tableMap, refCell.parentNode.parentNode.parentNode ) ; this._MoveCaretToCell( refCell, false ) ; @@ -435,9 +427,9 @@ cellContents.appendChild( nextCell.removeChild( nextCell.firstChild ) ) ; if ( cellContents.firstChild ) - cellContents.insertBefore( FCKTools.GetElementDocument( nextCell ).createElement( 'br' ), cellContents.firstChild ) ; + cellContents.insertBefore( FCK.EditorDocument.createElement( 'br' ), cellContents.firstChild ) ; refCell.appendChild( cellContents ) ; this._MarkCells( [nextCell], '_Replace' ) ; this._ReplaceCellsByMarker( tableMap, '_Replace', refCell ) ; - this._InstallTableMap( tableMap, refCell.parentNode.parentNode ) ; + this._InstallTableMap( tableMap, refCell.parentNode.parentNode.parentNode ) ; this._MoveCaretToCell( refCell, false ) ; @@ -451,5 +443,5 @@ var refCell = cells[0] ; - var tableMap = this._CreateTableMap( refCell.parentNode.parentNode ) ; + var tableMap = this._CreateTableMap( refCell ) ; var rowIdx = refCell.parentNode.rowIndex ; var colIdx = FCKTableHandler._GetCellIndexSpan( tableMap, rowIdx, refCell ) ; @@ -458,8 +450,8 @@ if ( cellSpan > 1 ) { - // Splittng a multi-column cell - original cell gets ceil(colSpan/2) columns, + // Splitting a multi-column cell - original cell gets ceil(colSpan/2) columns, // new cell gets floor(colSpan/2). var newCellSpan = Math.ceil( cellSpan / 2 ) ; - var newCell = FCKTools.GetElementDocument( refCell ).createElement( 'td' ) ; + var newCell = FCK.EditorDocument.createElement( refCell.nodeName ) ; if ( FCKBrowserInfo.IsGeckoLike ) FCKTools.AppendBogusBr( newCell ) ; @@ -489,5 +481,5 @@ { newRow.push( refCell ) ; - newRow.push( FCKTools.GetElementDocument( refCell ).createElement( 'td' ) ) ; + newRow.push( FCK.EditorDocument.createElement( refCell.nodeName ) ) ; if ( FCKBrowserInfo.IsGeckoLike ) FCKTools.AppendBogusBr( newRow[newRow.length - 1] ) ; @@ -505,5 +497,5 @@ } - this._InstallTableMap( tableMap, refCell.parentNode.parentNode ) ; + this._InstallTableMap( tableMap, refCell.parentNode.parentNode.parentNode ) ; } @@ -515,8 +507,10 @@ var currentCell = cells[0] ; - var tableMap = this._CreateTableMap( currentCell.parentNode.parentNode ) ; - var cellIndex = FCKTableHandler._GetCellIndexSpan( tableMap, currentCell.parentNode.rowIndex, currentCell ) ; + var tableMap = this._CreateTableMap( currentCell ) ; + var currentRowIndex = currentCell.parentNode.rowIndex ; + var cellIndex = FCKTableHandler._GetCellIndexSpan( tableMap, currentRowIndex, currentCell ) ; + // Save current cell colSpan + var currentColSpan = isNaN( currentCell.colSpan ) ? 1 : currentCell.colSpan ; var currentRowSpan = currentCell.rowSpan ; - var currentRowIndex = currentCell.parentNode.rowIndex ; if ( isNaN( currentRowSpan ) ) currentRowSpan = 1 ; @@ -529,31 +523,34 @@ // 2. Find the appropriate place to insert a new cell at the next row. var newCellRowIndex = currentRowIndex + Math.ceil( currentRowSpan / 2 ) ; + var oRow = tableMap[newCellRowIndex] ; var insertMarker = null ; - for ( var i = cellIndex+1 ; i < tableMap[newCellRowIndex].length ; i++ ) - { - if ( tableMap[newCellRowIndex][i].parentNode.rowIndex == newCellRowIndex ) - { - insertMarker = tableMap[newCellRowIndex][i] ; + for ( var i = cellIndex+1 ; i < oRow.length ; i++ ) + { + if ( oRow[i].parentNode.rowIndex == newCellRowIndex ) + { + insertMarker = oRow[i] ; break ; } } - // 3. Insert the new cell to the indicated place, with the appropriate rowSpan, next row. - var newCell = FCK.EditorDocument.createElement( 'td' ) ; + // 3. Insert the new cell to the indicated place, with the appropriate rowSpan and colSpan, next row. + var newCell = FCK.EditorDocument.createElement( currentCell.nodeName ) ; newCell.rowSpan = Math.floor( currentRowSpan / 2 ) ; + if ( currentColSpan > 1 ) + newCell.colSpan = currentColSpan ; if ( FCKBrowserInfo.IsGeckoLike ) FCKTools.AppendBogusBr( newCell ) ; - currentCell.parentNode.parentNode.rows[newCellRowIndex].insertBefore( newCell, insertMarker ) ; + currentCell.parentNode.parentNode.parentNode.rows[newCellRowIndex].insertBefore( newCell, insertMarker ) ; } else { // 1. Insert a new row. - var newCellRowIndex = currentRowIndex + 1 ; + var newSectionRowIdx = currentCell.parentNode.sectionRowIndex + 1 ; var newRow = FCK.EditorDocument.createElement( 'tr' ) ; - var tBody = currentCell.parentNode.parentNode ; - if ( tBody.rows.length > newCellRowIndex ) - tBody.insertBefore( newRow, tBody.rows[newCellRowIndex] ) ; + var tSection = currentCell.parentNode.parentNode ; + if ( tSection.rows.length > newSectionRowIdx ) + tSection.insertBefore( newRow, tSection.rows[newSectionRowIdx] ) ; else - tBody.appendChild( newRow ) ; + tSection.appendChild( newRow ) ; // 2. +1 to rowSpan for all cells crossing currentCell's row. @@ -575,6 +572,8 @@ } - // 3. Insert a new cell to new row. - var newCell = FCK.EditorDocument.createElement( 'td' ) ; + // 3. Insert a new cell to new row. Set colSpan on the new cell. + var newCell = FCK.EditorDocument.createElement( currentCell.nodeName ) ; + if ( currentColSpan > 1 ) + newCell.colSpan = currentColSpan ; if ( FCKBrowserInfo.IsGeckoLike ) FCKTools.AppendBogusBr( newCell ) ; @@ -611,19 +610,4 @@ } return null ; -} - -// Get the cells available in a column of a TableMap. -FCKTableHandler._GetColumnCells = function( tableMap, columnIndex ) -{ - var aCollCells = new Array() ; - - for ( var r = 0 ; r < tableMap.length ; r++ ) - { - var oCell = tableMap[r][columnIndex] ; - if ( oCell && ( aCollCells.length == 0 || aCollCells[ aCollCells.length - 1 ] != oCell ) ) - aCollCells[ aCollCells.length ] = oCell ; - } - - return aCollCells ; } @@ -632,8 +616,11 @@ // cells that are "spanned". For example, a row with 3 cells where the second cell has colSpan=2 and rowSpan=3 // will produce a bi-dimensional matrix with the following values (representing the cells): -// Cell1, Cell2, Cell2, Cell 3 -// Cell4, Cell2, Cell2, Cell 5 -FCKTableHandler._CreateTableMap = function( table ) -{ +// Cell1, Cell2, Cell2, Cell3 +// Cell4, Cell2, Cell2, Cell5 +// Cell6, Cell2, Cell2, Cell7 +FCKTableHandler._CreateTableMap = function( refCell ) +{ + var table = (refCell.nodeName == 'TABLE' ? refCell : refCell.parentNode.parentNode.parentNode ) ; + var aRows = table.rows ; @@ -686,11 +673,4 @@ // for storing the calculated rowSpan in IE. var rowSpanAttr = FCKBrowserInfo.IsIE ? "_fckrowspan" : "rowSpan" ; - - // Clear the table of all rows first. - while ( table.rows.length > 0 ) - { - var row = table.rows[0] ; - row.parentNode.removeChild( row ) ; - } // Disconnect all the cells in tableMap from their parents, set all colSpan and rowSpan attributes to 1. @@ -749,14 +729,6 @@ { var cell = tableMap[i][j] ; - if ( FCKBrowserInfo.IsIE ) - { - cell.removeAttribute( '_colScanned' ) ; - cell.removeAttribute( '_rowScanned' ) ; - } - else - { - delete cell._colScanned ; - delete cell._rowScanned ; - } + FCKDomTools.ClearElementJSProperty(cell, '_colScanned' ) ; + FCKDomTools.ClearElementJSProperty(cell, '_rowScanned' ) ; } } @@ -765,5 +737,5 @@ for ( var i = 0 ; i < tableMap.length ; i++ ) { - var rowObj = FCKTools.GetElementDocument( table ).createElement( 'tr' ) ; + var rowObj = FCK.EditorDocument.createElement( 'tr' ) ; for ( var j = 0 ; j < tableMap[i].length ; ) { @@ -786,5 +758,13 @@ cell.removeAttribute( 'rowspan' ) ; } - table.appendChild( rowObj ) ; + if ( FCKBrowserInfo.IsIE ) + { + table.rows[i].replaceNode( rowObj ) ; + } + else + { + table.rows[i].innerHTML = '' ; + FCKDomTools.MoveChildren( rowObj, table.rows[i] ) ; + } } } @@ -820,5 +800,5 @@ var refCell = cells[0] ; - var tableMap = this._CreateTableMap( refCell.parentNode.parentNode ) ; + var tableMap = this._CreateTableMap( refCell ) ; var rowIdx = refCell.parentNode.rowIndex ; var colIdx = this._GetCellIndexSpan( tableMap, rowIdx, refCell ) ; @@ -848,5 +828,5 @@ var refCell = cells[0] ; - var tableMap = this._CreateTableMap( refCell.parentNode.parentNode ) ; + var tableMap = this._CreateTableMap( refCell ) ; var rowIdx = refCell.parentNode.rowIndex ; var colIdx = this._GetCellIndexSpan( tableMap, rowIdx, refCell ) ; Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fcktablehandler_gecko.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fcktablehandler_gecko.js (revision 2910) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fcktablehandler_gecko.js (revision 2911) @@ -49,5 +49,5 @@ oCell = oRange.startContainer.childNodes[ oRange.startOffset ] ; - if ( oCell.tagName.Equals( 'TD', 'TH' ) ) + if ( oCell.nodeName.Equals( 'TD', 'TH' ) ) aCells[aCells.length] = oCell ; } Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fcktablehandler_ie.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fcktablehandler_ie.js (revision 2910) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fcktablehandler_ie.js (revision 2911) @@ -26,5 +26,5 @@ if ( FCKSelection.GetType() == 'Control' ) { - var td = FCKSelection.MoveToAncestorNode( 'TD' ) ; + var td = FCKSelection.MoveToAncestorNode( ['TD', 'TH'] ) ; return td ? [ td ] : [] ; } Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckxhtml.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckxhtml.js (revision 2910) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckxhtml.js (revision 2911) @@ -297,5 +297,5 @@ FCKXHtml._AppendSpecialItem = function( item ) { - return '___FCKsi___' + FCKXHtml.SpecialBlocks.AddItem( item ) ; + return '___FCKsi___' + ( FCKXHtml.SpecialBlocks.push( item ) - 1 ) ; } Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckxhtmlentities.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckxhtmlentities.js (revision 2910) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckxhtmlentities.js (revision 2911) @@ -151,5 +151,5 @@ // '&':'amp', // This entity is automatically handled by the XHTML parser. // '<':'lt', // This entity is automatically handled by the XHTML parser. - // '>':'gt', // This entity is automatically handled by the XHTML parser. + '>':'gt', // Opera and Safari don't encode it in their implementation 'ˆ':'circ', '˜':'tilde', @@ -332,10 +332,13 @@ else { - FCKXHtmlEntities.Entities = {} ; + FCKXHtmlEntities.Entities = { + '>':'gt' // Opera and Safari don't encode it in their implementation + } ; + sChars = '>'; // Even if we are not processing the entities, we must render the   // correctly. As we don't want HTML entities, let's use its numeric // representation ( ). - sChars = ' ' ; + sChars += ' ' ; } Index: /FCKeditor/branches/versions/2.6.x/editor/dialog/common/fck_dialog_common.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/dialog/common/fck_dialog_common.js (revision 2910) +++ /FCKeditor/branches/versions/2.6.x/editor/dialog/common/fck_dialog_common.js (revision 2911) @@ -311,4 +311,40 @@ } // The style: - oDest.style.cssText = oSource.style.cssText ; -} + if ( oSource.style.cssText !== '' ) + oDest.style.cssText = oSource.style.cssText ; +} + +/** +* Replaces a tag with another one, keeping its contents: +* for example TD --> TH, and TH --> TD. +* input: the original node, and the new tag name +* http://www.w3.org/TR/DOM-Level-3-Core/core.html#Document3-renameNode +*/ +function RenameNode( oNode , newTag ) +{ + // TODO: if the browser natively supports document.renameNode call it. + // does any browser currently support it in order to test? + + // Only rename element nodes. + if ( oNode.nodeType != 1 ) + return null ; + + // If it's already correct exit here. + if ( oNode.nodeName == newTag ) + return oNode ; + + var oDoc = oNode.ownerDocument ; + // Create the new node + var newNode = oDoc.createElement( newTag ) ; + + // Copy all attributes + CopyAttributes( oNode, newNode, {} ) ; + + // Move children to the new node + FCKDomTools.MoveChildren( oNode, newNode ) ; + + // Finally replace the node and return the new one + oNode.parentNode.replaceChild( newNode, oNode ) ; + + return newNode ; +} Index: /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_div.html =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_div.html (revision 2910) +++ /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_div.html (revision 2911) @@ -204,10 +204,41 @@ var block ; - iterator.EnforceRealBlocks = true ; var paragraphs = [] ; + while ( ( block = iterator.GetNextParagraph() ) ) + paragraphs.push( block ) ; + + // Make sure all paragraphs have the same parent. + var commonParent = paragraphs[0].parentNode ; + var tmp = [] ; + for ( var i = 0 ; i < paragraphs.length ; i++ ) + { + block = paragraphs[i] ; + commonParent = FCKDomTools.GetCommonParents( block.parentNode, commonParent ).pop() ; + } + + // The common parent must not be the following tags: table, tbody, tr, ol, ul. + while ( commonParent.nodeName.IEquals( 'table', 'tbody', 'tr', 'ol', 'ul' ) ) + commonParent = commonParent.parentNode ; + + // Reconstruct the block list to be processed such that all resulting blocks + // satisfy parentNode == commonParent. + var lastBlock = null ; + while ( paragraphs.length > 0 ) + { + block = paragraphs.shift() ; + while ( block.parentNode != commonParent ) + block = block.parentNode ; + if ( block != lastBlock ) + tmp.push( block ) ; + lastBlock = block ; + } + paragraphs = tmp ; + + // Split the paragraphs into groups depending on their BlockLimit element. var groups = [] ; var lastBlockLimit = null ; - while ( ( block = iterator.GetNextParagraph() ) ) - { + for ( var i = 0 ; i < paragraphs.length ; i++ ) + { + block = paragraphs[i] ; var elementPath = new FCKElementPath( block ) ; if ( elementPath.BlockLimit != lastBlockLimit ) @@ -219,4 +250,5 @@ } + // Create a DIV container for each group. for ( var i = 0 ; i < groups.length ; i++ ) { Index: /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_docprops.html =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_docprops.html (revision 2910) +++ /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_docprops.html (revision 2911) @@ -457,5 +457,5 @@ Document Type Heading
-