Index: /FCKeditor/branches/versions/2.6.x/_dev/build_release.bat =================================================================== --- /FCKeditor/branches/versions/2.6.x/_dev/build_release.bat (revision 2112) +++ /FCKeditor/branches/versions/2.6.x/_dev/build_release.bat (revision 2113) @@ -26,5 +26,5 @@ :: Update this variable for each new release. -SET RELEASER_VERSION=2.6.1 +SET RELEASER_VERSION=2.6.2 CLS Index: /FCKeditor/branches/versions/2.6.x/_whatsnew.html =================================================================== --- /FCKeditor/branches/versions/2.6.x/_whatsnew.html (revision 2112) +++ /FCKeditor/branches/versions/2.6.x/_whatsnew.html (revision 2113) @@ -34,111 +34,49 @@ FCKeditor ChangeLog - What's New?

- Version 2.6.1

+ Version 2.6.2

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 2112) +++ /FCKeditor/branches/versions/2.6.x/_whatsnew_history.html (revision 2113) @@ -33,4 +33,113 @@

FCKeditor ChangeLog - What's New?

+

+ Version 2.6.1

+

+ New Features and Improvements:

+ +

+ Fixed Bugs:

+

Version 2.6

Index: /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckdomrange.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckdomrange.js (revision 2112) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckdomrange.js (revision 2113) @@ -869,4 +869,10 @@ FCKDomTools.TrimNode( oFixedBlock ) ; + // If the fixed block is empty (not counting bookmark nodes) + // Add a
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 ) ; Index: /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckenterkey.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckenterkey.js (revision 2112) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckenterkey.js (revision 2113) @@ -44,15 +44,19 @@ [ 13 , 'Enter' ], [ SHIFT + 13, 'ShiftEnter' ], - [ 9 , 'Tab' ], [ 8 , 'Backspace' ], - [ CTRL + 8 , 'CtrlBackspace' ], + [ CTRL + 8 , 'CtrlBackspace' ], [ 46 , 'Delete' ] ] ) ; - if ( tabSpaces > 0 ) - { - this.TabText = '' ; - while ( tabSpaces-- > 0 ) + this.TabText = '' ; + + // Safari by default inserts 4 spaces on TAB, while others make the editor + // loose focus. So, we need to handle it here to not include those spaces. + if ( tabSpaces > 0 || FCKBrowserInfo.IsSafari ) + { + while ( tabSpaces-- ) this.TabText += '\xa0' ; + + oKeystrokeHandler.SetKeystrokes( [ 9, 'Tab' ] ); } @@ -532,8 +536,6 @@ } - if ( FCKBrowserInfo.IsSafari ) + if ( FCKBrowserInfo.IsGeckoLike ) FCKDomTools.ScrollIntoView( eNextBlock || eNewBlock, false ) ; - else if ( FCKBrowserInfo.IsGeckoLike ) - ( eNextBlock || eNewBlock ).scrollIntoView( false ) ; oRange.Select() ; Index: /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckiecleanup.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckiecleanup.js (revision 2112) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckiecleanup.js (revision 2113) @@ -44,5 +44,5 @@ function FCKIECleanup_Cleanup() { - if ( !this._FCKCleanupObj || !window.FCKUnloadFlag ) + if ( !this._FCKCleanupObj || ( FCKConfig.MsWebBrowserControlCompat && !window.FCKUnloadFlag ) ) return ; Index: /FCKeditor/branches/versions/2.6.x/editor/_source/fckeditorapi.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/fckeditorapi.js (revision 2112) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/fckeditorapi.js (revision 2113) @@ -165,5 +165,6 @@ function FCKeditorAPI_Cleanup() { - if ( ! window.FCKUnloadFlag ) + if ( window.FCKConfig && FCKConfig.MsWebBrowserControlCompat + && !window.FCKUnloadFlag ) return ; delete FCKeditorAPI.Instances[ FCK.Name ] ; @@ -171,5 +172,6 @@ function FCKeditorAPI_ConfirmCleanup() { - window.FCKUnloadFlag = true ; + if ( window.FCKConfig && FCKConfig.MsWebBrowserControlCompat ) + window.FCKUnloadFlag = true ; } FCKTools.AddEventListener( window, 'unload', FCKeditorAPI_Cleanup ) ; Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck.js (revision 2112) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck.js (revision 2113) @@ -674,7 +674,20 @@ 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 ) ; @@ -706,7 +719,5 @@ else { - // Delete the current selection and insert the node. - range.MoveToSelection() ; - range.DeleteContents() ; + // Insert the node. range.InsertNode( element ) ; 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 2112) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck_gecko.js (revision 2113) @@ -350,4 +350,6 @@ FCK.InsertHtml = function( html ) { + var doc = FCK.EditorDocument ; + html = FCKConfig.ProtectedSource.Protect( html ) ; html = FCK.ProtectEvents( html ) ; @@ -358,6 +360,21 @@ FCKUndo.SaveUndoStep() ; + if ( FCKBrowserInfo.IsGecko ) + { + // Using the following trick,   present at the beginning and at + // the end of the HTML are preserved (#2248). + html = '' + html + '' ; + } + // Insert the HTML code. - this.EditorDocument.execCommand( 'inserthtml', false, html ) ; + doc.execCommand( 'inserthtml', false, html ) ; + + if ( FCKBrowserInfo.IsGecko ) + { + // Remove the fake nodes. + FCKDomTools.RemoveNode( doc.getElementById('__fakeFCKRemove1__') ) ; + FCKDomTools.RemoveNode( doc.getElementById('__fakeFCKRemove2__') ) ; + } + this.Focus() ; @@ -367,5 +384,5 @@ var bookmark = range.CreateBookmark() ; - FCKDocumentProcessor.Process( FCK.EditorDocument ) ; + FCKDocumentProcessor.Process( doc ) ; // Restore caret position, ignore any errors in case the document 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 2112) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck_ie.js (revision 2113) @@ -30,9 +30,9 @@ if ( !FCK._BehaviorsStyle ) { - var sBasePath = FCKConfig.FullBasePath ; + var sBasePath = FCKConfig.BasePath ; var sTableBehavior = '' ; var sStyle ; - // The behaviors should be pointed using the FullBasePath to avoid security + // The behaviors should be pointed using the BasePath to avoid security // errors when using a different BaseHref. sStyle = '