Index: /FCKeditor/branches/features/new_samples/_dev/build_release.bat =================================================================== --- /FCKeditor/branches/features/new_samples/_dev/build_release.bat (revision 2122) +++ /FCKeditor/branches/features/new_samples/_dev/build_release.bat (revision 2123) @@ -26,5 +26,5 @@ :: Update this variable for each new release. -SET RELEASER_VERSION=2.6.1 (SVN) +SET RELEASER_VERSION=2.6.3 (SVN) CLS Index: /FCKeditor/branches/features/new_samples/_dev/css_compression.txt =================================================================== --- /FCKeditor/branches/features/new_samples/_dev/css_compression.txt (revision 2123) +++ /FCKeditor/branches/features/new_samples/_dev/css_compression.txt (revision 2123) @@ -0,0 +1,41 @@ +** + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2008 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == +** + +The following is the normal procedure to compress CSS data to be included in +the editor source or configuration files. + +1. Open the CSS compression tool page: + http://iceyboard.no-ip.org/projects/css_compressor + +2. Paste the full CSS data in the "CSS" text box. + +3. Leave all default options, expect in the "Output options" box, unchecking + the following items: + + - Show statistics + - Output in colour + +4. Submit the form. + +5. In the results page, hit CTRL+A to select all data and copy it to the + clipboard. + +6. Paste the data as is in the desired place. Index: /FCKeditor/branches/features/new_samples/_dev/domain_fix_template.js =================================================================== --- /FCKeditor/branches/features/new_samples/_dev/domain_fix_template.js (revision 2122) +++ /FCKeditor/branches/features/new_samples/_dev/domain_fix_template.js (revision 2123) @@ -26,5 +26,5 @@ // ### Minified Script (must be updated on changes in the original below). -(function(){var d=document.domain;while (true){try{var A=window.top.opener.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})(); +(function(){var d=document.domain;while (true){try{var A=window.parent.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})(); // ### Original Script. @@ -39,5 +39,5 @@ try { - var test = window.top.opener.document.domain ; + var test = window.parent.document.domain ; break ; } Index: /FCKeditor/branches/features/new_samples/_samples/sample.css =================================================================== --- /FCKeditor/branches/features/new_samples/_samples/sample.css (revision 2122) +++ /FCKeditor/branches/features/new_samples/_samples/sample.css (revision 2123) @@ -41,5 +41,5 @@ } -#outputSample +#outputSample { table-layout:fixed; @@ -55,11 +55,11 @@ white-space: -o-pre-wrap; /* Opera 7 */ white-space: pre-wrap; /* CSS 2.1 */ - white-space: pre-line; /* CSS 3 (and 2.1 as well, actually) */ + white-space: pre-line; /* CSS 3 (and 2.1 as well, actually) */ word-wrap: break-word; /* IE */ } -#outputSample thead th +#outputSample thead th { - color: #dddddd; + color: #dddddd; background-color: #999999; padding: 4px; @@ -67,5 +67,5 @@ } -#outputSample tbody th +#outputSample tbody th { vertical-align: top; Index: /FCKeditor/branches/features/new_samples/_whatsnew.html =================================================================== --- /FCKeditor/branches/features/new_samples/_whatsnew.html (revision 2122) +++ /FCKeditor/branches/features/new_samples/_whatsnew.html (revision 2123) @@ -34,343 +34,17 @@ FCKeditor ChangeLog - What's New?

- Version 2.6.1 (SVN)

+ Version 2.6.3 (SVN)

New Features and Improvements:

Fixed Bugs:

-

- Version 2.6

-

- No changes. The stabilization of the 2.6 RC was completed successfully, as expected.

-

- Version 2.6 RC

-

- New Features and Improvements:

-

- Fixed Bugs:

- -

- Version 2.6 Beta 1

-

- New Features and Improvements:

- -

- Fixed Bugs:

- -

- See previous versions history -

+ See previous versions history

Index: /FCKeditor/branches/features/new_samples/_whatsnew_history.html =================================================================== --- /FCKeditor/branches/features/new_samples/_whatsnew_history.html (revision 2122) +++ /FCKeditor/branches/features/new_samples/_whatsnew_history.html (revision 2123) @@ -33,4 +33,418 @@

FCKeditor ChangeLog - What's New?

+

+ Version 2.6.2

+

+ New Features and Improvements:

+ +

+ Fixed Bugs:

+ +

+ Version 2.6.1

+

+ New Features and Improvements:

+ +

+ Fixed Bugs:

+ +

+ Version 2.6

+

+ No changes. The stabilization of the 2.6 RC was completed successfully, as expected.

+

+ Version 2.6 RC

+

+ New Features and Improvements:

+ +

+ Fixed Bugs:

+ +

+ Version 2.6 Beta 1

+

+ New Features and Improvements:

+ +

+ Fixed Bugs:

+

Version 2.5.1

Index: /FCKeditor/branches/features/new_samples/editor/_source/classes/fckdomrange.js =================================================================== --- /FCKeditor/branches/features/new_samples/editor/_source/classes/fckdomrange.js (revision 2122) +++ /FCKeditor/branches/features/new_samples/editor/_source/classes/fckdomrange.js (revision 2123) @@ -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/features/new_samples/editor/_source/classes/fckeditingarea.js =================================================================== --- /FCKeditor/branches/features/new_samples/editor/_source/classes/fckeditingarea.js (revision 2122) +++ /FCKeditor/branches/features/new_samples/editor/_source/classes/fckeditingarea.js (revision 2123) @@ -248,4 +248,5 @@ { oDoc.body.innerHTML = this._BodyHTML ; + oDoc.body.offsetLeft ; // Don't remove, this is a hack to fix Opera 9.50, see #2264. this._BodyHTML = null ; } Index: /FCKeditor/branches/features/new_samples/editor/_source/classes/fckenterkey.js =================================================================== --- /FCKeditor/branches/features/new_samples/editor/_source/classes/fckenterkey.js (revision 2122) +++ /FCKeditor/branches/features/new_samples/editor/_source/classes/fckenterkey.js (revision 2123) @@ -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/features/new_samples/editor/_source/classes/fckiecleanup.js =================================================================== --- /FCKeditor/branches/features/new_samples/editor/_source/classes/fckiecleanup.js (revision 2122) +++ /FCKeditor/branches/features/new_samples/editor/_source/classes/fckiecleanup.js (revision 2123) @@ -44,5 +44,5 @@ function FCKIECleanup_Cleanup() { - if ( !this._FCKCleanupObj || !window.FCKUnloadFlag ) + if ( !this._FCKCleanupObj || ( FCKConfig.MsWebBrowserControlCompat && !window.FCKUnloadFlag ) ) return ; Index: /FCKeditor/branches/features/new_samples/editor/_source/commandclasses/fckfitwindow.js =================================================================== --- /FCKeditor/branches/features/new_samples/editor/_source/commandclasses/fckfitwindow.js (revision 2122) +++ /FCKeditor/branches/features/new_samples/editor/_source/commandclasses/fckfitwindow.js (revision 2123) @@ -84,4 +84,5 @@ eEditorFrameStyle.position = "absolute"; + eEditorFrame.offsetLeft ; // Kludge for Safari 3.1 browser bug, do not remove. See #2066. eEditorFrameStyle.zIndex = FCKConfig.FloatingPanelsZIndex - 1; eEditorFrameStyle.left = "0px"; Index: /FCKeditor/branches/features/new_samples/editor/_source/fckeditorapi.js =================================================================== --- /FCKeditor/branches/features/new_samples/editor/_source/fckeditorapi.js (revision 2122) +++ /FCKeditor/branches/features/new_samples/editor/_source/fckeditorapi.js (revision 2123) @@ -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/features/new_samples/editor/_source/internals/fck.js =================================================================== --- /FCKeditor/branches/features/new_samples/editor/_source/internals/fck.js (revision 2122) +++ /FCKeditor/branches/features/new_samples/editor/_source/internals/fck.js (revision 2123) @@ -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/features/new_samples/editor/_source/internals/fck_gecko.js =================================================================== --- /FCKeditor/branches/features/new_samples/editor/_source/internals/fck_gecko.js (revision 2122) +++ /FCKeditor/branches/features/new_samples/editor/_source/internals/fck_gecko.js (revision 2123) @@ -105,5 +105,5 @@ // only perform the patched behavior if we're in an tag, or the End key is pressed. var parentTag = node.parentNode.tagName.toLowerCase() ; - if ( ! ( parentTag == 'a' || String(node.parentNode.contentEditable) == 'false' || + if ( ! ( parentTag == 'a' || ( !FCKBrowserInfo.IsOpera && String(node.parentNode.contentEditable) == 'false' ) || ( ! ( FCKListsLib.BlockElements[parentTag] || FCKListsLib.NonEmptyBlockElements[parentTag] ) && keyCode == 35 ) ) ) @@ -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/features/new_samples/editor/_source/internals/fck_ie.js =================================================================== --- /FCKeditor/branches/features/new_samples/editor/_source/internals/fck_ie.js (revision 2122) +++ /FCKeditor/branches/features/new_samples/editor/_source/internals/fck_ie.js (revision 2123) @@ -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 = '