Index: /FCKeditor/releases/latest/_documentation.html =================================================================== --- /FCKeditor/releases/latest/_documentation.html (revision 1827) +++ /FCKeditor/releases/latest/_documentation.html (revision 1828) @@ -33,6 +33,6 @@ FCKeditor Documentation

- You can find the official documentation for FCKeditor online, at - http://wiki.fckeditor.net/.

+ You can find the official documentation for FCKeditor online, at + http://docs.fckeditor.net/.

Index: /FCKeditor/releases/latest/_samples/html/sample06.config.js =================================================================== --- /FCKeditor/releases/latest/_samples/html/sample06.config.js (revision 1827) +++ /FCKeditor/releases/latest/_samples/html/sample06.config.js (revision 1828) @@ -40,10 +40,10 @@ // pluginName: The plugin name. The plugin directory must match this name. // availableLanguages: a list of available language files for the plugin (separated by a comma). -FCKConfig.Plugins.Add( 'findreplace', 'en,it,fr' ) ; +FCKConfig.Plugins.Add( 'findreplace', 'en,fr,it' ) ; FCKConfig.Plugins.Add( 'samples' ) ; // If you want to use plugins found on other directories, just use the third parameter. var sOtherPluginPath = FCKConfig.BasePath.substr(0, FCKConfig.BasePath.length - 7) + 'editor/plugins/' ; -FCKConfig.Plugins.Add( 'placeholder', 'en,it,de,fr', sOtherPluginPath ) ; +FCKConfig.Plugins.Add( 'placeholder', 'de,en,es,fr,it,pl', sOtherPluginPath ) ; FCKConfig.Plugins.Add( 'tablecommands', null, sOtherPluginPath ) ; FCKConfig.Plugins.Add( 'simplecommands', null, sOtherPluginPath ) ; Index: /FCKeditor/releases/latest/_samples/perl/sample01.cgi =================================================================== --- /FCKeditor/releases/latest/_samples/perl/sample01.cgi (revision 1827) +++ /FCKeditor/releases/latest/_samples/perl/sample01.cgi (revision 1828) @@ -110,4 +110,6 @@ } elsif($ENV{'FILEPATH_INFO'}) { $dir = $ENV{'FILEPATH_INFO'}; + } elsif($ENV{'REQUEST_URI'}) { + $dir = $ENV{'REQUEST_URI'}; } } Index: /FCKeditor/releases/latest/_samples/perl/sample02.cgi =================================================================== --- /FCKeditor/releases/latest/_samples/perl/sample02.cgi (revision 1827) +++ /FCKeditor/releases/latest/_samples/perl/sample02.cgi (revision 1828) @@ -175,4 +175,6 @@ } elsif($ENV{'FILEPATH_INFO'}) { $dir = $ENV{'FILEPATH_INFO'}; + } elsif($ENV{'REQUEST_URI'}) { + $dir = $ENV{'REQUEST_URI'}; } } Index: /FCKeditor/releases/latest/_samples/perl/sample03.cgi =================================================================== --- /FCKeditor/releases/latest/_samples/perl/sample03.cgi (revision 1827) +++ /FCKeditor/releases/latest/_samples/perl/sample03.cgi (revision 1828) @@ -160,4 +160,6 @@ } elsif($ENV{'FILEPATH_INFO'}) { $dir = $ENV{'FILEPATH_INFO'}; + } elsif($ENV{'REQUEST_URI'}) { + $dir = $ENV{'REQUEST_URI'}; } } Index: /FCKeditor/releases/latest/_samples/perl/sample04.cgi =================================================================== --- /FCKeditor/releases/latest/_samples/perl/sample04.cgi (revision 1827) +++ /FCKeditor/releases/latest/_samples/perl/sample04.cgi (revision 1828) @@ -167,4 +167,6 @@ } elsif($ENV{'FILEPATH_INFO'}) { $dir = $ENV{'FILEPATH_INFO'}; + } elsif($ENV{'REQUEST_URI'}) { + $dir = $ENV{'REQUEST_URI'}; } } Index: /FCKeditor/releases/latest/_upgrade.html =================================================================== --- /FCKeditor/releases/latest/_upgrade.html (revision 1827) +++ /FCKeditor/releases/latest/_upgrade.html (revision 1828) @@ -33,6 +33,7 @@ FCKeditor Upgrade

- Please check the following URL for notes regarding upgrade: - http://wiki.fckeditor.net/Developer%27s_Guide/Upgrade

+ Please check the following URL for notes regarding upgrade:
+ + http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Installation/Upgrading

Index: /FCKeditor/releases/latest/_whatsnew.html =================================================================== --- /FCKeditor/releases/latest/_whatsnew.html (revision 1827) +++ /FCKeditor/releases/latest/_whatsnew.html (revision 1828) @@ -34,5 +34,116 @@ FCKeditor ChangeLog - What's New?

- Version 2.6 Beta

+ Version 2.6 RC +

+ New Features and Improvements:

+ +

+ Fixed Bugs:

+ +

+ Version 2.6 Beta 1

New Features and Improvements:

@@ -88,5 +199,5 @@
  • [#805] The FCKConfig.Keystrokes commands where executed even if the command itself was disabled.
    • -
  • [#902] The button +
  • [#982] The button to empty the box in the "Paste from Word" has been removed as it leads to confusion for some users.
    • @@ -134,5 +245,5 @@ of depreciated "var").
  • [#1815] PHP integration: - removed closing tag: "?>", so no additional whitespace added when files are included.
    • + removed closing tag: "?>", so no additional whitespace added when files are included.
  • [#1906] PHP file browser: fixed problems with DetectHtml() function when open_basedir was set.
    • @@ -166,4 +277,9 @@
  • [#1868] Links to file browser has been changed to avoid requests containing double dots.
    • +
  • [#1229] Converting + multiple contiguous paragraphs to Formatted will now be merged into a single <PRE> + block.
    • +
  • [#1627] Samples + failed to load from local filesystem in IE7.

    • Index: /FCKeditor/releases/latest/editor/_source/classes/fckdomrange.js =================================================================== --- /FCKeditor/releases/latest/editor/_source/classes/fckdomrange.js (revision 1827) +++ /FCKeditor/releases/latest/editor/_source/classes/fckdomrange.js (revision 1828) @@ -149,10 +149,18 @@ MoveToElementEditStart : function( targetElement ) { - var child ; - - while ( ( child = targetElement.firstChild ) && child.nodeType == 1 && FCKListsLib.InlineNonEmptyElements[ child.nodeName.toLowerCase() ] ) - targetElement = child ; - - this.MoveToElementStart( targetElement ) ; + var editableElement ; + + while ( targetElement && targetElement.nodeType == 1 ) + { + if ( FCKDomTools.CheckIsEditable( targetElement ) ) + editableElement = targetElement ; + else if ( editableElement ) + break ; // If we already found an editable element, stop the loop. + + targetElement = targetElement.firstChild ; + } + + if ( editableElement ) + this.MoveToElementStart( editableElement ) ; }, @@ -740,5 +748,5 @@ * - PreviousBlock : a reference to the block element that preceeds * the range after the split. - * - NextBlock : a reference to the block element that preceeds the + * - NextBlock : a reference to the block element that follows the * range after the split. * - WasStartOfBlock : a boolean indicating that the range was @@ -751,6 +759,8 @@ * NextBlock value if the range was at the end of the block. */ - SplitBlock : function() - { + SplitBlock : function( forceBlockTag ) + { + var blockTag = forceBlockTag || FCKConfig.EnterMode ; + if ( !this._Range ) this.MoveToSelection() ; @@ -764,14 +774,14 @@ var oElementPath = null ; - if ( FCKConfig.EnterMode != 'br' ) + if ( blockTag != 'br' ) { if ( !eStartBlock ) { - eStartBlock = this.FixBlock( true ) ; + eStartBlock = this.FixBlock( true, blockTag ) ; eEndBlock = this.EndBlock ; // FixBlock may have fixed the EndBlock too. } if ( !eEndBlock ) - eEndBlock = this.FixBlock( false ) ; + eEndBlock = this.FixBlock( false, blockTag ) ; } @@ -836,5 +846,5 @@ // Transform a block without a block tag in a valid block (orphan text in the body or td, usually). - FixBlock : function( isStart ) + FixBlock : function( isStart, blockTag ) { // Bookmark the range so we can restore it later. @@ -848,5 +858,5 @@ // Create the fixed block. - var oFixedBlock = this.Window.document.createElement( FCKConfig.EnterMode ) ; + var oFixedBlock = this.Window.document.createElement( blockTag ) ; // Move the contents of the temporary range to the fixed block. Index: /FCKeditor/releases/latest/editor/_source/classes/fckeditingarea.js =================================================================== --- /FCKeditor/releases/latest/editor/_source/classes/fckeditingarea.js (revision 1827) +++ /FCKeditor/releases/latest/editor/_source/classes/fckeditingarea.js (revision 1828) @@ -92,4 +92,8 @@ var oIFrame = this.IFrame = oTargetDocument.createElement( 'iframe' ) ; + // IE: Avoid JavaScript errors thrown by the editing are source (like tags events). + // See #1055. + var sOverrideError = '' ; + oIFrame.frameBorder = 0 ; oIFrame.width = oIFrame.height = '100%' ; @@ -97,5 +101,5 @@ if ( FCK_IS_CUSTOM_DOMAIN && FCKBrowserInfo.IsIE ) { - window._FCKHtmlToLoad = html ; + window._FCKHtmlToLoad = sOverrideError + html ; oIFrame.src = 'javascript:void( (function(){' + 'document.open() ;' + @@ -129,5 +133,5 @@ oDoc.open() ; - oDoc.write( html ) ; + oDoc.write( sOverrideError + html ) ; oDoc.close() ; } @@ -296,14 +300,8 @@ if ( this.Mode == FCK_EDITMODE_WYSIWYG ) { - // The following check is important to avoid IE entering in a focus loop. Ref: - // http://sourceforge.net/tracker/index.php?func=detail&aid=1567060&group_id=75348&atid=543653 - if ( FCKBrowserInfo.IsIE && this.Document.hasFocus() ) - this._EnsureFocusIE() ; - - this.Window.focus() ; - - // In IE it can happen that the document is in theory focused but the active element is outside it if ( FCKBrowserInfo.IsIE ) - this._EnsureFocusIE() ; + this._FocusIE() ; + else + this.Window.focus() ; } else @@ -319,8 +317,11 @@ } -FCKEditingArea.prototype._EnsureFocusIE = function() -{ - // In IE it can happen that the document is in theory focused but the active element is outside it +FCKEditingArea.prototype._FocusIE = function() +{ + // In IE it can happen that the document is in theory focused but the + // active element is outside of it. this.Document.body.setActive() ; + + this.Window.focus() ; // Kludge for #141... yet more code to workaround IE bugs @@ -338,12 +339,9 @@ } - range.moveEnd( "character", 1 ) ; - range.select() ; - - if ( range.boundingWidth > 0 ) - { - range.moveEnd( "character", -1 ) ; - range.select() ; - } + // Force the selection to happen, in this way we guarantee the focus will + // be there. + range = new FCKDomRange( this.Window ) ; + range.MoveToElementEditStart( parentNode ) ; + range.Select() ; } Index: /FCKeditor/releases/latest/editor/_source/classes/fckenterkey.js =================================================================== --- /FCKeditor/releases/latest/editor/_source/classes/fckenterkey.js (revision 1827) +++ /FCKeditor/releases/latest/editor/_source/classes/fckenterkey.js (revision 1828) @@ -394,7 +394,5 @@ var oRange = range || new FCKDomRange( this.Window ) ; - var oSplitInfo = oRange.SplitBlock() ; - - // FCKDebug.OutputObject( oSplitInfo ) ; + var oSplitInfo = oRange.SplitBlock( blockTag ) ; if ( oSplitInfo ) @@ -406,4 +404,20 @@ var bIsStartOfBlock = oSplitInfo.WasStartOfBlock ; var bIsEndOfBlock = oSplitInfo.WasEndOfBlock ; + + // If there is one block under a list item, modify the split so that the list item gets split as well. (Bug #1647) + if ( eNextBlock ) + { + if ( eNextBlock.parentNode.nodeName.IEquals( 'li' ) ) + { + FCKDomTools.BreakParent( eNextBlock, eNextBlock.parentNode ) ; + FCKDomTools.MoveNode( eNextBlock, eNextBlock.nextSibling, true ) ; + } + } + else if ( ePreviousBlock && ePreviousBlock.parentNode.nodeName.IEquals( 'li' ) ) + { + FCKDomTools.BreakParent( ePreviousBlock, ePreviousBlock.parentNode ) ; + oRange.MoveToElementEditStart( ePreviousBlock.nextSibling ); + FCKDomTools.MoveNode( ePreviousBlock, ePreviousBlock.previousSibling ) ; + } // If we have both the previous and next blocks, it means that the Index: /FCKeditor/releases/latest/editor/_source/classes/fckpanel.js =================================================================== --- /FCKeditor/releases/latest/editor/_source/classes/fckpanel.js (revision 1827) +++ /FCKeditor/releases/latest/editor/_source/classes/fckpanel.js (revision 1828) @@ -35,17 +35,30 @@ if ( FCKBrowserInfo.IsIE ) { + // Create the Popup that will hold the panel. + // The popup has to be created before playing with domain hacks, see #1666. + this._Popup = this._Window.createPopup() ; + + // this._Window cannot be accessed while playing with domain hacks, but local variable is ok. + // See #1666. + var pDoc = this._Window.document ; + // This is a trick to IE6 (not IE7). The original domain must be set // before creating the popup, so we are able to take a refence to the // document inside of it, and the set the proper domain for it. (#123) - if ( FCK_IS_CUSTOM_DOMAIN ) + if ( FCK_IS_CUSTOM_DOMAIN && !FCKBrowserInfo.IsIE7 ) + { + pDoc.domain = FCK_ORIGINAL_DOMAIN ; document.domain = FCK_ORIGINAL_DOMAIN ; - - // Create the Popup that will hold the panel. - this._Popup = this._Window.createPopup() ; + } + oDocument = this.Document = this._Popup.document ; // Set the proper domain inside the popup. if ( FCK_IS_CUSTOM_DOMAIN ) - document.domain = oDocument.domain = FCK_RUNTIME_DOMAIN ; + { + oDocument.domain = FCK_RUNTIME_DOMAIN ; + pDoc.domain = FCK_RUNTIME_DOMAIN ; + document.domain = FCK_RUNTIME_DOMAIN ; + } FCK.IECleanup.AddItem( this, FCKPanel_Cleanup ) ; @@ -256,17 +269,17 @@ } ) ; + // Move the focus to the IFRAME so we catch the "onblur". + this._IFrame.contentWindow.focus() ; + this._IsOpened = true ; + var me = this ; - var resizeFunc = function() - { - var iWidth = eMainNode.offsetWidth || eMainNode.firstChild.offsetWidth ; - var iHeight = eMainNode.offsetHeight ; - me._IFrame.width = iWidth ; - me._IFrame.height = iHeight ; - - // Move the focus to the IFRAME so we catch the "onblur". - me._IFrame.contentWindow.focus() ; - me._IsOpened = true ; - } - setTimeout( resizeFunc, 1 ) ; + this._resizeTimer = setTimeout( function() + { + var iWidth = eMainNode.offsetWidth || eMainNode.firstChild.offsetWidth ; + var iHeight = eMainNode.offsetHeight ; + me._IFrame.width = iWidth ; + me._IFrame.height = iHeight ; + + }, 0 ) ; FCK.ToolbarSet.CurrentInstance.GetInstanceObject( 'FCKPanel' )._OpenedPanel = this ; @@ -294,4 +307,10 @@ this._IsOpened = false ; + + if ( this._resizeTimer ) + { + clearTimeout( this._resizeTimer ) ; + this._resizeTimer = null ; + } if ( this.ParentPanel ) Index: /FCKeditor/releases/latest/editor/_source/classes/fckstyle.js =================================================================== --- /FCKeditor/releases/latest/editor/_source/classes/fckstyle.js (revision 1827) +++ /FCKeditor/releases/latest/editor/_source/classes/fckstyle.js (revision 1828) @@ -279,4 +279,6 @@ if ( updateRange ) range.MoveToBookmark( bookmark ) ; + + return ; } @@ -285,5 +287,5 @@ // Bookmark the range so we can re-select it after processing. - var bookmark = range.CreateBookmark( true ) ; + bookmark = range.CreateBookmark( true ) ; // The style will be applied within the bookmark boundaries. @@ -856,4 +858,7 @@ var doc = range.Window.document ; + var preBlocks = [] ; + var convertedPreBlocks = [] ; + while( ( block = iterator.GetNextParagraph() ) ) // Only one = { @@ -865,7 +870,13 @@ var blockIsPre = block.nodeName.IEquals( 'pre' ) ; if ( newBlockIsPre && !blockIsPre ) + { newBlock = this._ToPre( doc, block, newBlock ) ; + preBlocks.push( newBlock ) ; + } else if ( !newBlockIsPre && blockIsPre ) + { newBlock = this._FromPre( doc, block, newBlock ) ; + convertedPreBlocks.push( newBlock ) ; + } else // Convering from a regular block to another regular block. FCKDomTools.MoveChildren( block, newBlock ) ; @@ -874,4 +885,46 @@ block.parentNode.insertBefore( newBlock, block ) ; FCKDomTools.RemoveNode( block ) ; + } + + // Merge adjacent 

     blocks for #1229.
+		for ( var i = 0 ; i < preBlocks.length - 1 ; i++ )
+		{
+			// Check if the next block in HTML equals the next 
     block generated.
+			if ( FCKDomTools.GetNextSourceElement( preBlocks[i], true, [], [], true ) != preBlocks[i+1] )
+				continue ;
+
+			// Merge the upper 
     block's content into the lower 
     block.
+			// Remove the upper 
     block.
+			preBlocks[i+1].innerHTML = preBlocks[i].innerHTML + '\n\n' + preBlocks[i+1].innerHTML ;
+			FCKDomTools.RemoveNode( preBlocks[i] ) ;
+		}
+
+		// Split converted 
     blocks for #1229.
+		for ( var i = 0 ; i < convertedPreBlocks.length ; i++ )
+		{
+			var currentBlock = convertedPreBlocks[i] ;
+			var lastNewBlock = null ;
+			for ( var j = 0 ; j < currentBlock.childNodes.length ; j++ )
+			{
+				var cursor = currentBlock.childNodes[j] ;
+
+				// If we have two 
    s, and they're not at the beginning or the end,
+				// then we'll split up the contents following them into another block.
+				if ( cursor.nodeName.IEquals( 'br' ) && j != 0 && j != currentBlock.childNodes.length - 2
+						&& cursor.nextSibling && cursor.nextSibling.nodeName.IEquals( 'br' ) )
+				{
+					FCKDomTools.RemoveNode( cursor.nextSibling ) ;
+					FCKDomTools.RemoveNode( cursor ) ;
+					j-- ;	// restart at current index at next iteration
+					lastNewBlock = FCKDomTools.InsertAfterNode( lastNewBlock || currentBlock, doc.createElement( currentBlock.nodeName ) ) ;
+					continue ;
+				}
+
+				if ( lastNewBlock )
+				{
+					FCKDomTools.MoveNode( cursor, lastNewBlock ) ;
+					j-- ;	// restart at current index at next iteration
+				}
+			}
 		}
 
Index: /FCKeditor/releases/latest/editor/_source/classes/fcktoolbarbutton.js
===================================================================
--- /FCKeditor/releases/latest/editor/_source/classes/fcktoolbarbutton.js	(revision 1827)
+++ /FCKeditor/releases/latest/editor/_source/classes/fcktoolbarbutton.js	(revision 1828)
@@ -49,12 +49,17 @@
 FCKToolbarButton.prototype.RefreshState = function()
 {
+	var uiButton = this._UIButton ;
+
+	if ( !uiButton )
+		return ;
+
 	// Gets the actual state.
 	var eState = FCK.ToolbarSet.CurrentInstance.Commands.GetCommand( this.CommandName ).GetState() ;
 
 	// If there are no state changes than do nothing and return.
-	if ( eState == this._UIButton.State ) return ;
+	if ( eState == uiButton.State ) return ;
 
 	// Sets the actual state.
-	this._UIButton.ChangeState( eState ) ;
+	uiButton.ChangeState( eState ) ;
 }
 
Index: /FCKeditor/releases/latest/editor/_source/classes/fckw3crange.js
===================================================================
--- /FCKeditor/releases/latest/editor/_source/classes/fckw3crange.js	(revision 1827)
+++ /FCKeditor/releases/latest/editor/_source/classes/fckw3crange.js	(revision 1828)
@@ -262,17 +262,21 @@
 			// If the start container has children and the offset is pointing
 			// to a child, then we should start from its previous sibling.
-			if ( startNode.childNodes.length > 0 &&  startOffset <= startNode.childNodes.length - 1 )
-			{
-				// If the offset points to the first node, we don't have a
-				// sibling, so let's use the first one, but mark it for removal.
-				if ( startOffset == 0 )
-				{
-					// Let's create a temporary node and mark it for removal.
-					startNode = startNode.insertBefore( this._Document.createTextNode(''), startNode.firstChild ) ;
-					removeStartNode = true ;
-				}
-				else
-					startNode = startNode.childNodes[ startOffset ].previousSibling ;
-			}
+
+			// If the offset points to the first node, we don't have a
+			// sibling, so let's use the first one, but mark it for removal.
+			if ( startOffset == 0 )
+			{
+				// Let's create a temporary node and mark it for removal.
+				startNode = startNode.insertBefore( this._Document.createTextNode(''), startNode.firstChild ) ;
+				removeStartNode = true ;
+			}
+			else if ( startOffset > startNode.childNodes.length - 1 )
+			{
+				// Let's create a temporary node and mark it for removal.
+				startNode = startNode.appendChild( this._Document.createTextNode('') ) ;
+				removeStartNode = true ;
+			}
+			else
+				startNode = startNode.childNodes[ startOffset ].previousSibling ;
 		}
 
Index: /FCKeditor/releases/latest/editor/_source/commandclasses/fck_othercommands.js
===================================================================
--- /FCKeditor/releases/latest/editor/_source/commandclasses/fck_othercommands.js	(revision 1827)
+++ /FCKeditor/releases/latest/editor/_source/commandclasses/fck_othercommands.js	(revision 1828)
@@ -258,8 +258,5 @@
 	oRange.MoveToSelection() ;
 	var oSplitInfo = oRange.SplitBlock() ;
-	if ( oSplitInfo.NextBlock )
-		oSplitInfo.NextBlock.parentNode.insertBefore( oFakeImage, oSplitInfo.NextBlock ) ;
-	else
-		oSplitInfo.PreviousBlock.parentNode.insertBefore( oFakeImage, oSplitInfo.PreviousBlock.nextSibling ) ;
+	oRange.InsertNode( oFakeImage ) ;
 
 	FCK.Events.FireEvent( 'OnSelectionChange' ) ;
Index: /FCKeditor/releases/latest/editor/_source/commandclasses/fcklistcommands.js
===================================================================
--- /FCKeditor/releases/latest/editor/_source/commandclasses/fcklistcommands.js	(revision 1827)
+++ /FCKeditor/releases/latest/editor/_source/commandclasses/fcklistcommands.js	(revision 1828)
@@ -146,5 +146,5 @@
 				{
 					rangeQueue = [] ;
-					var selectionObject = FCK.EditorWindow.getSelection() ;
+					var selectionObject = FCKSelection.GetSelection() ;
 					if ( selectionObject && listGroups.length == 0 )
 						rangeQueue.push( selectionObject.getRangeAt( 0 ) ) ;
Index: /FCKeditor/releases/latest/editor/_source/fckeditorapi.js
===================================================================
--- /FCKeditor/releases/latest/editor/_source/fckeditorapi.js	(revision 1827)
+++ /FCKeditor/releases/latest/editor/_source/fckeditorapi.js	(revision 1828)
@@ -41,18 +41,18 @@
 		var sScript =
 			'window.FCKeditorAPI = {' +
-				'Version : "2.6 Beta 1",' +
-				'VersionBuild : "18219",' +
-				'__Instances : new Object(),' +
+				'Version : "2.6 RC",' +
+				'VersionBuild : "18531",' +
+				'Instances : new Object(),' +
 
 				'GetInstance : function( name )' +
 				'{' +
-					'return this.__Instances[ name ];' +
+					'return this.Instances[ name ];' +
 				'},' +
 
 				'_FormSubmit : function()' +
 				'{' +
-					'for ( var name in FCKeditorAPI.__Instances )' +
+					'for ( var name in FCKeditorAPI.Instances )' +
 					'{' +
-						'var oEditor = FCKeditorAPI.__Instances[ name ] ;' +
+						'var oEditor = FCKeditorAPI.Instances[ name ] ;' +
 						'if ( oEditor.GetParentForm && oEditor.GetParentForm() == this )' +
 							'oEditor.UpdateLinkedField() ;' +
@@ -130,8 +130,12 @@
 
 		FCKeditorAPI = oParentWindow.FCKeditorAPI ;
+
+		// The __Instances properly has been changed to the public Instances,
+		// but we should still have the "deprecated" version of it.
+		FCKeditorAPI.__Instances = FCKeditorAPI.Instances ;
 	}
 
 	// Add the current instance to the FCKeditorAPI's instances collection.
-	FCKeditorAPI.__Instances[ FCK.Name ] = FCK ;
+	FCKeditorAPI.Instances[ FCK.Name ] = FCK ;
 }
 
@@ -163,5 +167,5 @@
 	if ( ! window.FCKUnloadFlag )
 		return ;
-	delete FCKeditorAPI.__Instances[ FCK.Name ] ;
+	delete FCKeditorAPI.Instances[ FCK.Name ] ;
 }
 function FCKeditorAPI_ConfirmCleanup()
Index: /FCKeditor/releases/latest/editor/_source/fckscriptloader.js
===================================================================
--- /FCKeditor/releases/latest/editor/_source/fckscriptloader.js	(revision 1827)
+++ /FCKeditor/releases/latest/editor/_source/fckscriptloader.js	(revision 1828)
@@ -41,4 +41,6 @@
 		return ;
 
+	FCKScriptLoader._LoadedScripts[ scriptName ] = true ;
+
 	var oScriptInfo = this._Scripts[ scriptName ] ;
 
@@ -66,6 +68,4 @@
 			this._LoadScript( sBaseScriptName + '_gecko.js' ) ;
 	}
-
-	FCKScriptLoader._LoadedScripts[ scriptName ] = true ;
 }
 
@@ -111,5 +111,5 @@
 FCKScriptLoader.AddScript( 'FCKConfig'			, 'internals/'	, ['FCKBrowserInfo','FCKConstants'] ) ;
 FCKScriptLoader.AddScript( 'FCKDebug'			, 'internals/'	, ['FCKConfig'] ) ;
-FCKScriptLoader.AddScript( 'FCKDomTools'		, 'internals/'	, ['FCKJSCoreExtensions','FCKBrowserInfo','FCKTools'], FCK_GENERIC ) ;
+FCKScriptLoader.AddScript( 'FCKDomTools'		, 'internals/'	, ['FCKJSCoreExtensions','FCKBrowserInfo','FCKTools','FCKDomRange'], FCK_GENERIC ) ;
 FCKScriptLoader.AddScript( 'FCKListsLib'		, 'internals/' ) ;
 FCKScriptLoader.AddScript( 'FCKListHandler'		, 'internals/'	, ['FCKConfig', 'FCKDocumentFragment', 'FCKJSCoreExtensions','FCKDomTools'], FCK_GENERIC ) ;
Index: /FCKeditor/releases/latest/editor/_source/internals/fck.js
===================================================================
--- /FCKeditor/releases/latest/editor/_source/internals/fck.js	(revision 1827)
+++ /FCKeditor/releases/latest/editor/_source/internals/fck.js	(revision 1828)
@@ -364,5 +364,5 @@
 		// IE doesn't support  and it breaks it. Let's protect it.
 		if ( FCKBrowserInfo.IsIE )
-			sTags += sTags.length > 0 ? '|ABBR|XML|EMBED' : 'ABBR|XML|EMBED' ;
+			sTags += sTags.length > 0 ? '|ABBR|XML|EMBED|OBJECT' : 'ABBR|XML|EMBED|OBJECT' ;
 
 		var oRegex ;
@@ -400,5 +400,5 @@
 		if ( FCKBrowserInfo.IsIE && FCK.EditorDocument )
 		{
-				FCK.EditorDocument.detachEvent("onselectionchange", Doc_OnSelectionChange ) ;
+			FCK.EditorDocument.detachEvent("onselectionchange", Doc_OnSelectionChange ) ;
 		}
 
@@ -659,4 +659,6 @@
 		var elementName = element.nodeName.toLowerCase() ;
 
+		FCKSelection.Restore() ;
+
 		// Create a range for the selection. V3 will have a new selection
 		// object that may internally supply this feature.
@@ -668,5 +670,5 @@
 			range.InsertNode( element ) ;
 
-			var next = FCKDomTools.GetNextSourceElement( element, false, null, [ 'hr','br','param','img','area','input' ] ) ;
+			var next = FCKDomTools.GetNextSourceElement( element, false, null, [ 'hr','br','param','img','area','input' ], true ) ;
 
 			// Be sure that we have something after the new element, so we can move the cursor there.
@@ -862,5 +864,5 @@
 		// Prevent the caret from going between the body and the padding node in Firefox.
 		// i.e. |
    
-		var sel = FCK.EditorWindow.getSelection() ;
+		var sel = FCKSelection.GetSelection() ;
 		if ( sel && sel.rangeCount == 1 )
 		{
@@ -1144,6 +1146,20 @@
 function FCKFocusManager_Win_OnFocus_Area()
 {
+	// Check if we are already focusing the editor (to avoid loops).
+	if ( FCKFocusManager._IsFocusing )
+		return ;
+
+	FCKFocusManager._IsFocusing = true ;
+
 	FCK.Focus() ;
 	FCKFocusManager_Win_OnFocus() ;
+
+	// The above FCK.Focus() call may trigger other focus related functions.
+	// So, to avoid a loop, we delay the focusing mark removal, so it get
+	// executed after all othre functions have been run.
+	FCKTools.RunFunction( function()
+		{
+			delete FCKFocusManager._IsFocusing ;
+		} ) ;
 }
 
Index: /FCKeditor/releases/latest/editor/_source/internals/fck_gecko.js
===================================================================
--- /FCKeditor/releases/latest/editor/_source/internals/fck_gecko.js	(revision 1827)
+++ /FCKeditor/releases/latest/editor/_source/internals/fck_gecko.js	(revision 1828)
@@ -89,5 +89,5 @@
 		var moveCursor = function()
 		{
-			var selection = FCK.EditorWindow.getSelection() ;
+			var selection = FCKSelection.GetSelection() ;
 			var range = selection.getRangeAt(0) ;
 			if ( ! range || ! range.collapsed )
@@ -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' ||
+			if ( ! (  parentTag == 'a' || String(node.parentNode.contentEditable) == 'false' ||
 					( ! ( FCKListsLib.BlockElements[parentTag] || FCKListsLib.NonEmptyBlockElements[parentTag] )
 					  && keyCode == 35 ) ) )
@@ -362,4 +362,6 @@
 	this.Focus() ;
 
+	FCKDocumentProcessor.Process( FCK.EditorDocument ) ;
+
 	// For some strange reason the SaveUndoStep() call doesn't activate the undo button at the first InsertHtml() call.
 	this.Events.FireEvent( "OnSelectionChange" ) ;
@@ -447,5 +449,5 @@
 {
 	FCK._FillEmptyBlock( FCK.EditorDocument.body.firstChild ) ;
-	var sel = FCK.EditorWindow.getSelection() ;
+	var sel = FCKSelection.GetSelection() ;
 	if ( !sel || sel.rangeCount < 1 )
 		return ;
Index: /FCKeditor/releases/latest/editor/_source/internals/fck_ie.js
===================================================================
--- /FCKeditor/releases/latest/editor/_source/internals/fck_ie.js	(revision 1827)
+++ /FCKeditor/releases/latest/editor/_source/internals/fck_ie.js	(revision 1828)
@@ -94,5 +94,5 @@
 {
 	// Don't fire the event if no document is loaded.
-	if ( FCK.EditorDocument )
+	if ( !FCK.IsSelectionChangeLocked && FCK.EditorDocument )
 		FCK.Events.FireEvent( "OnSelectionChange" ) ;
 }
@@ -156,5 +156,5 @@
 
 	// Gets the actual selection.
-	var oSel = FCK.EditorDocument.selection ;
+	var oSel = FCKSelection.GetSelection() ;
 
 	// Deletes the actual selection contents.
Index: /FCKeditor/releases/latest/editor/_source/internals/fckcommands.js
===================================================================
--- /FCKeditor/releases/latest/editor/_source/internals/fckcommands.js	(revision 1827)
+++ /FCKeditor/releases/latest/editor/_source/internals/fckcommands.js	(revision 1828)
@@ -56,5 +56,5 @@
 		case 'BulletedList'	: oCommand = new FCKDialogCommand( 'BulletedList', FCKLang.BulletedListProp		, 'dialog/fck_listprop.html?UL'	, 370, 160 ) ; break ;
 		case 'NumberedList'	: oCommand = new FCKDialogCommand( 'NumberedList', FCKLang.NumberedListProp		, 'dialog/fck_listprop.html?OL'	, 370, 160 ) ; break ;
-		case 'About'		: oCommand = new FCKDialogCommand( 'About'		, FCKLang.About					, 'dialog/fck_about.html'		, 400, 310, function(){ return FCK_TRISTATE_OFF ; } ) ; break ;
+		case 'About'		: oCommand = new FCKDialogCommand( 'About'		, FCKLang.About					, 'dialog/fck_about.html'		, 420, 330, function(){ return FCK_TRISTATE_OFF ; } ) ; break ;
 		case 'Find'			: oCommand = new FCKDialogCommand( 'Find'		, FCKLang.DlgFindAndReplaceTitle, 'dialog/fck_replace.html'		, 340, 230, null, null, 'Find' ) ; break ;
 		case 'Replace'		: oCommand = new FCKDialogCommand( 'Replace'	, FCKLang.DlgFindAndReplaceTitle, 'dialog/fck_replace.html'		, 340, 230, null, null, 'Replace' ) ; break ;
Index: /FCKeditor/releases/latest/editor/_source/internals/fckconfig.js
===================================================================
--- /FCKeditor/releases/latest/editor/_source/internals/fckconfig.js	(revision 1827)
+++ /FCKeditor/releases/latest/editor/_source/internals/fckconfig.js	(revision 1828)
@@ -177,8 +177,5 @@
 
 	//