typo 5.0.3.98.1 → 5.1

data/public/javascripts/fckeditor/editor/_source/classes/fckiecleanup.js

@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *

data/public/javascripts/fckeditor/editor/_source/classes/fckimagepreloader.js

@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -61,4 +61,4 @@ function _FCKImagePreloader_OnImage( ev, imagePreloader )
 {
 	if ( (--imagePreloader._PreloadCount) == 0 && imagePreloader.OnComplete )
 		imagePreloader.OnComplete() ;
-}
+}

data/public/javascripts/fckeditor/editor/_source/classes/fckkeystrokehandler.js

@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -56,9 +56,9 @@ FCKKeystrokeHandler.prototype.SetKeystrokes = function()
 
 		// If the configuration for the keystrokes is missing some element or has any extra comma
 		// this item won't be valid, so skip it and keep on processing.
-		if ( !keyDef ) 
+		if ( !keyDef )
 			continue ;
-		
+
 		if ( typeof( keyDef[0] ) == 'object' )		// It is an array with arrays defining the keystrokes.
 			this.SetKeystrokes.apply( this, keyDef ) ;
 		else

data/public/javascripts/fckeditor/editor/_source/classes/fckmenublock.js

@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -32,9 +32,9 @@ FCKMenuBlock.prototype.Count = function()
 	return this._Items.length ;
 }
 
-FCKMenuBlock.prototype.AddItem = function( name, label, iconPathOrStripInfoArrayOrIndex, isDisabled )
+FCKMenuBlock.prototype.AddItem = function( name, label, iconPathOrStripInfoArrayOrIndex, isDisabled, customData )
 {
-	var oItem = new FCKMenuItem( this, name, label, iconPathOrStripInfoArrayOrIndex, isDisabled ) ;
+	var oItem = new FCKMenuItem( this, name, label, iconPathOrStripInfoArrayOrIndex, isDisabled, customData ) ;
 
 	oItem.OnClick		= FCKTools.CreateEventListener( FCKMenuBlock_Item_OnClick, this ) ;
 	oItem.OnActivate	= FCKTools.CreateEventListener( FCKMenuBlock_Item_OnActivate, this ) ;
@@ -94,6 +94,9 @@ FCKMenuBlock.prototype.Create = function( parentElement )
 
 function FCKMenuBlock_Item_OnClick( clickedItem, menuBlock )
 {
+	if ( menuBlock.Hide )
+		menuBlock.Hide() ;
+
 	FCKTools.RunFunction( menuBlock.OnClick, menuBlock, [ clickedItem ] ) ;
 }
 
@@ -107,7 +110,7 @@ function FCKMenuBlock_Item_OnActivate( menuBlock )
 		if ( !FCKBrowserInfo.IsIE && oActiveItem.HasSubMenu && !this.HasSubMenu )
 		{
 			menuBlock._Window.focus() ;
-			
+
 			// Due to the event model provided by Opera, we need to set
 			// HasFocus here as the above focus() call will not fire the focus
 			// event in the panel immediately (#1200).
@@ -147,4 +150,4 @@ FCKMenuSeparator.prototype.Create = function( parentTable )
 	eCell = r.insertCell(-1) ;
 	eCell.className = 'MN_Separator' ;
 	eCell.appendChild( oDoc.createElement( 'DIV' ) ).className = 'MN_Separator_Line' ;
-}
+}

data/public/javascripts/fckeditor/editor/_source/classes/fckmenublockpanel.js

@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -35,7 +35,7 @@ FCKMenuBlockPanel.prototype = new FCKMenuBlock() ;
 FCKMenuBlockPanel.prototype.Create = function()
 {
 	var oPanel = this.Panel = ( this.Parent && this.Parent.Panel ? this.Parent.Panel.CreateChildPanel() : new FCKPanel() ) ;
-	oPanel.AppendStyleSheet( FCKConfig.SkinPath + 'fck_editor.css' ) ;
+	oPanel.AppendStyleSheet( FCKConfig.SkinEditorCSS ) ;
 
 	// Call the "base" implementation.
 	FCKMenuBlock.prototype.Create.call( this, oPanel.MainNode ) ;
@@ -51,4 +51,4 @@ FCKMenuBlockPanel.prototype.Hide = function()
 {
 	if ( this.Panel.CheckIsOpened() )
 		this.Panel.Hide() ;
-}
+}

data/public/javascripts/fckeditor/editor/_source/classes/fckmenuitem.js

@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -21,7 +21,7 @@
  * Defines and renders a menu items in a menu block.
  */
 
-var FCKMenuItem = function( parentMenuBlock, name, label, iconPathOrStripInfoArray, isDisabled )
+var FCKMenuItem = function( parentMenuBlock, name, label, iconPathOrStripInfoArray, isDisabled, customData )
 {
 	this.Name		= name ;
 	this.Label		= label || name ;
@@ -32,16 +32,17 @@ var FCKMenuItem = function( parentMenuBlock, name, label, iconPathOrStripInfoArr
 	this.SubMenu			= new FCKMenuBlockPanel() ;
 	this.SubMenu.Parent		= parentMenuBlock ;
 	this.SubMenu.OnClick	= FCKTools.CreateEventListener( FCKMenuItem_SubMenu_OnClick, this ) ;
+	this.CustomData = customData ;
 
 	if ( FCK.IECleanup )
 		FCK.IECleanup.AddItem( this, FCKMenuItem_Cleanup ) ;
 }
 
 
-FCKMenuItem.prototype.AddItem = function( name, label, iconPathOrStripInfoArrayOrIndex, isDisabled )
+FCKMenuItem.prototype.AddItem = function( name, label, iconPathOrStripInfoArrayOrIndex, isDisabled, customData )
 {
 	this.HasSubMenu = true ;
-	return this.SubMenu.AddItem( name, label, iconPathOrStripInfoArrayOrIndex, isDisabled ) ;
+	return this.SubMenu.AddItem( name, label, iconPathOrStripInfoArrayOrIndex, isDisabled, customData ) ;
 }
 
 FCKMenuItem.prototype.AddSeparator = function()
@@ -157,4 +158,4 @@ function FCKMenuItem_OnMouseOut( ev, menuItem )
 function FCKMenuItem_Cleanup()
 {
 	this.MainElement = null ;
-}
+}

data/public/javascripts/fckeditor/editor/_source/classes/fckpanel.js

@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -35,9 +35,32 @@ var FCKPanel = function( parentWindow )
 	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 && !FCKBrowserInfo.IsIE7 )
+		{
+			pDoc.domain = FCK_ORIGINAL_DOMAIN ;
+			document.domain = FCK_ORIGINAL_DOMAIN ;
+		}
+
 		oDocument = this.Document = this._Popup.document ;
 
+		// Set the proper domain inside the popup.
+		if ( FCK_IS_CUSTOM_DOMAIN )
+		{
+			oDocument.domain = FCK_RUNTIME_DOMAIN ;
+			pDoc.domain = FCK_RUNTIME_DOMAIN ;
+			document.domain = FCK_RUNTIME_DOMAIN ;
+		}
+
 		FCK.IECleanup.AddItem( this, FCKPanel_Cleanup ) ;
 	}
 	else
@@ -54,24 +77,7 @@ var FCKPanel = function( parentWindow )
 				zIndex		: FCKConfig.FloatingPanelsZIndex
 			} ) ;
 
-		if ( this._Window == window.parent && window.frameElement )
-		{
-			var scrollPos = null ;
-			if ( FCKBrowserInfo.IsGecko && FCK && FCK.EditorDocument )
-				scrollPos = [ FCK.EditorDocument.body.scrollLeft, FCK.EditorDocument.body.scrollTop ] ;
-			window.frameElement.parentNode.insertBefore( oIFrame, window.frameElement ) ;
-			if ( scrollPos )
-			{
-				var restoreFunc = function()
-				{
-					FCK.EditorDocument.body.scrollLeft = scrollPos[0] ;
-					FCK.EditorDocument.body.scrollTop = scrollPos[1] ;
-				}
-				setTimeout( restoreFunc, 500 ) ;
-			}
-		}
-		else
-			this._Window.document.body.appendChild( oIFrame ) ;
+		this._Window.document.body.appendChild( oIFrame ) ;
 
 		var oIFrameWindow = oIFrame.contentWindow ;
 
@@ -87,6 +93,9 @@ var FCKPanel = function( parentWindow )
 		oDocument.write( '<html><head>' + sBase + '<\/head><body style="margin:0px;padding:0px;"><\/body><\/html>' ) ;
 		oDocument.close() ;
 
+		if( FCKBrowserInfo.IsAIR )
+			FCKAdobeAIR.Panel_Contructor( oDocument, window.document.location ) ;
+
 		FCKTools.AddEventListenerEx( oIFrameWindow, 'focus', FCKPanel_Window_OnFocus, this ) ;
 		FCKTools.AddEventListenerEx( oIFrameWindow, 'blur', FCKPanel_Window_OnBlur, this ) ;
 	}
@@ -166,8 +175,29 @@ FCKPanel.prototype.Show = function( x, y, relElement, width, height )
 			FCK.ToolbarSet.CurrentInstance.FocusManager.Lock() ;
 
 		if ( this.ParentPanel )
+		{
 			this.ParentPanel.Lock() ;
 
+			// Due to a bug on FF3, we must ensure that the parent panel will
+			// blur (#1584).
+			FCKPanel_Window_OnBlur( null, this.ParentPanel ) ;
+		}
+
+		// Toggle the iframe scrolling attribute to prevent the panel
+		// scrollbars from disappearing in FF Mac. (#191)
+		if ( FCKBrowserInfo.IsGecko && FCKBrowserInfo.IsMac )
+		{
+			this._IFrame.scrolling = '' ;
+			FCKTools.RunFunction( function(){ this._IFrame.scrolling = 'no'; }, this ) ;
+		}
+
+		// Be sure we'll not have more than one Panel opened at the same time.
+		// Do not unlock focus manager here because we're displaying another floating panel
+		// instead of returning the editor to a "no panel" state (Bug #1514).
+		if ( FCK.ToolbarSet.CurrentInstance.GetInstanceObject( 'FCKPanel' )._OpenedPanel &&
+				FCK.ToolbarSet.CurrentInstance.GetInstanceObject( 'FCKPanel' )._OpenedPanel != this )
+			FCK.ToolbarSet.CurrentInstance.GetInstanceObject( 'FCKPanel' )._OpenedPanel.Hide( false, true ) ;
+
 		FCKDomTools.SetElementStyles( eMainNode,
 			{
 				width	: width ? width + 'px' : '',
@@ -188,17 +218,26 @@ FCKPanel.prototype.Show = function( x, y, relElement, width, height )
 		// for Opera compatibility (see #570).
 		iMainWidth = eMainNode.offsetWidth || eMainNode.firstChild.offsetWidth ;
 
-		var oPos = FCKTools.GetElementPosition(
+		// Base the popup coordinates upon the coordinates of relElement.
+		var oPos = FCKTools.GetDocumentPosition( this._Window,
 			relElement.nodeType == 9 ?
 				( FCKTools.IsStrictMode( relElement ) ? relElement.documentElement : relElement.body ) :
-				relElement,
-			this._Window ) ;
+				relElement ) ;
+
+		// Minus the offsets provided by any positioned parent element of the panel iframe.
+		var positionedAncestor = FCKDomTools.GetPositionedAncestor( this._IFrame.parentNode ) ;
+		if ( positionedAncestor )
+		{
+			var nPos = FCKTools.GetDocumentPosition( FCKTools.GetElementWindow( positionedAncestor ), positionedAncestor ) ;
+			oPos.x -= nPos.x ;
+			oPos.y -= nPos.y ;
+		}
 
 		if ( this.IsRTL && !this.IsContextMenu )
 			x = ( x * -1 ) ;
 
-		x += oPos.X ;
-		y += oPos.Y ;
+		x += oPos.x ;
+		y += oPos.y ;
 
 		if ( this.IsRTL )
 		{
@@ -222,9 +261,6 @@ FCKPanel.prototype.Show = function( x, y, relElement, width, height )
 				y -= y + eMainNode.offsetHeight - iViewPaneHeight ;
 		}
 
-		if ( x < 0 )
-			 x = 0 ;
-
 		// Set the context menu DIV in the specified location.
 		FCKDomTools.SetElementStyles( this._IFrame,
 			{
@@ -232,32 +268,37 @@ FCKPanel.prototype.Show = function( x, y, relElement, width, height )
 				top		: y + 'px'
 			} ) ;
 
-		var iWidth	= iMainWidth ;
-		var iHeight	= eMainNode.offsetHeight ;
-
-		this._IFrame.width	= iWidth ;
-		this._IFrame.height = iHeight ;
-
 		// Move the focus to the IFRAME so we catch the "onblur".
 		this._IFrame.contentWindow.focus() ;
-	}
+		this._IsOpened = true ;
+
+		var me = this ;
+		this._resizeTimer = setTimeout( function()
+			{
+				var iWidth = eMainNode.offsetWidth || eMainNode.firstChild.offsetWidth ;
+				var iHeight = eMainNode.offsetHeight ;
+				me._IFrame.width = iWidth ;
+				me._IFrame.height = iHeight ;
+
+			}, 0 ) ;
 
-	this._IsOpened = true ;
+		FCK.ToolbarSet.CurrentInstance.GetInstanceObject( 'FCKPanel' )._OpenedPanel = this ;
+	}
 
 	FCKTools.RunFunction( this.OnShow, this ) ;
 }
 
-FCKPanel.prototype.Hide = function( ignoreOnHide )
+FCKPanel.prototype.Hide = function( ignoreOnHide, ignoreFocusManagerUnlock )
 {
 	if ( this._Popup )
 		this._Popup.hide() ;
 	else
 	{
-		if ( !this._IsOpened )
+		if ( !this._IsOpened || this._LockCounter > 0 )
 			return ;
 
 		// Enable the editor to fire the "OnBlur".
-		if ( typeof( FCKFocusManager ) != 'undefined' )
+		if ( typeof( FCKFocusManager ) != 'undefined' && !ignoreFocusManagerUnlock )
 			FCKFocusManager.Unlock() ;
 
 		// It is better to set the sizes to 0, otherwise Firefox would have
@@ -266,6 +307,12 @@ FCKPanel.prototype.Hide = function( ignoreOnHide )
 
 		this._IsOpened = false ;
 
+		if ( this._resizeTimer )
+		{
+			clearTimeout( this._resizeTimer ) ;
+			this._resizeTimer = null ;
+		}
+
 		if ( this.ParentPanel )
 			this.ParentPanel.Unlock() ;
 

data/public/javascripts/fckeditor/editor/_source/classes/fckplugin.js

@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -53,4 +53,4 @@ FCKPlugin.prototype.Load = function()
 
 	// Add the main plugin script.
 	LoadScript( this.Path + 'fckplugin.js' ) ;
-}
+}

data/public/javascripts/fckeditor/editor/_source/classes/fckspecialcombo.js

@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -37,7 +37,7 @@ var FCKSpecialCombo = function( caption, fieldWidth, panelWidth, panelMaxHeight,
 	this.Items = new Object() ;
 
 	this._Panel = new FCKPanel( parentWindow || window ) ;
-	this._Panel.AppendStyleSheet( FCKConfig.SkinPath + 'fck_editor.css' ) ;
+	this._Panel.AppendStyleSheet( FCKConfig.SkinEditorCSS ) ;
 	this._PanelBox = this._Panel.MainNode.appendChild( this._Panel.Document.createElement( 'DIV' ) ) ;
 	this._PanelBox.className = 'SC_Panel' ;
 	this._PanelBox.style.width = this.PanelWidth + 'px' ;
@@ -81,11 +81,8 @@ function FCKSpecialCombo_ItemOnClick( ev, specialCombo, itemId )
 FCKSpecialCombo.prototype.ClearItems = function ()
 {
 	if ( this.Items )
-	{
-		for ( var key in this.Items )
-			this.Items[key] = null ;
-	}
-	
+		this.Items = {} ;
+
 	var itemsholder = this._ItemsHolderEl ;
 	while ( itemsholder.firstChild )
 		itemsholder.removeChild( itemsholder.firstChild ) ;
@@ -192,7 +189,9 @@ FCKSpecialCombo.prototype.SetEnabled = function( isEnabled )
 {
 	this.Enabled = isEnabled ;
 
-	this._OuterTable.className = isEnabled ? '' : 'SC_FieldDisabled' ;
+	// In IE it can happen when the page is reloaded that _OuterTable is null, so check its existence
+	if ( this._OuterTable )
+		this._OuterTable.className = isEnabled ? '' : 'SC_FieldDisabled' ;
 }
 
 FCKSpecialCombo.prototype.Create = function( targetElement )

data/public/javascripts/fckeditor/editor/_source/classes/fckstyle.js

@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -94,7 +94,7 @@ FCKStyle.prototype =
 	/**
 	 * Apply the style to a FCKDomRange.
 	 */
-	ApplyToRange : function( range, selectIt )
+	ApplyToRange : function( range, selectIt, updateRange )
 	{
 		// ApplyToRange is not valid for FCK_STYLE_OBJECT types.
 		// Use ApplyToObject instead.
@@ -111,7 +111,7 @@ FCKStyle.prototype =
 				return ;
 		}
 
-		this.ApplyToRange( range, selectIt ) ;
+		this.ApplyToRange( range, selectIt, updateRange ) ;
 	},
 
 	/**
@@ -141,7 +141,7 @@ FCKStyle.prototype =
 	 * Remove the style from a FCKDomRange. Block type styles will have no
 	 * effect.
 	 */
-	RemoveFromRange : function( range, selectIt )
+	RemoveFromRange : function( range, selectIt, updateRange )
 	{
 		var bookmark ;
 
@@ -231,8 +231,9 @@ FCKStyle.prototype =
 						// Remove overrides defined to the same element name.
 						this._RemoveOverrides( pathElement, styleOverrides[ pathElementName ] ) ;
 
-						// Remove the element if no more attributes are available.
-						this._RemoveNoAttribElement( pathElement ) ;
+						// Remove the element if no more attributes are available and it's an inline style element
+						if ( this.GetType() == FCK_STYLE_INLINE)
+							this._RemoveNoAttribElement( pathElement ) ;
 					}
 				}
 				else if ( isBoundary )
@@ -275,6 +276,9 @@ FCKStyle.prototype =
 			if ( selectIt )
 				range.SelectBookmark( bookmark ) ;
 
+			if ( updateRange )
+				range.MoveToBookmark( bookmark ) ;
+
 			return ;
 		}
 
@@ -282,7 +286,7 @@ FCKStyle.prototype =
 		range.Expand( 'inline_elements' ) ;
 
 		// 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.
 		var startNode	= range.GetBookmarkNode( bookmark, true ) ;
@@ -400,6 +404,9 @@ FCKStyle.prototype =
 		// Re-select the original range.
 		if ( selectIt )
 			range.SelectBookmark( bookmark ) ;
+
+		if ( updateRange )
+			range.MoveToBookmark( bookmark ) ;
 	},
 
 	/**
@@ -486,7 +493,7 @@ FCKStyle.prototype =
 		switch ( this.GetType() )
 		{
 			case FCK_STYLE_BLOCK :
-				return this.CheckElementRemovable( elementPath.Block || elementPath.BlockLimit ) ;
+				return this.CheckElementRemovable( elementPath.Block || elementPath.BlockLimit, true ) ;
 
 			case FCK_STYLE_INLINE :
 
@@ -688,7 +695,8 @@ FCKStyle.prototype =
 			valueB = valueB.replace( /;$/, '' ).toLowerCase() ;
 		}
 
-		return ( valueA == valueB )
+		// Return true if they match or if valueA is null and valueB is an empty string
+		return ( valueA == valueB || ( ( valueA === null || valueA === '' ) && ( valueB === null || valueB === '' ) ) )
 	},
 
 	GetFinalAttributeValue : function( attName )
@@ -740,6 +748,94 @@ FCKStyle.prototype =
 		this._Variables[ name ] = value ;
 	},
 
+	/**
+	 * Converting from a PRE block to a non-PRE block in formatting operations.
+	 */
+	_FromPre : function( doc, block, newBlock )
+	{
+		var innerHTML = block.innerHTML ;
+
+		// Trim the first and last linebreaks immediately after and before <pre>, </pre>,
+		// if they exist.
+		// This is done because the linebreaks are not rendered.
+		innerHTML = innerHTML.replace( /(\r\n|\r)/g, '\n' ) ;
+		innerHTML = innerHTML.replace( /^[ \t]*\n/, '' ) ;
+		innerHTML = innerHTML.replace( /\n$/, '' ) ;
+
+		// 1. Convert spaces or tabs at the beginning or at the end to &nbsp;
+		innerHTML = innerHTML.replace( /^[ \t]+|[ \t]+$/g, function( match, offset, s )
+				{
+					if ( match.length == 1 )	// one space, preserve it
+						return '&nbsp;' ;
+					else if ( offset == 0 )		// beginning of block
+						return new Array( match.length ).join( '&nbsp;' ) + ' ' ;
+					else				// end of block
+						return ' ' + new Array( match.length ).join( '&nbsp;' ) ;
+				} ) ;
+
+		// 2. Convert \n to <BR>.
+		// 3. Convert contiguous (i.e. non-singular) spaces or tabs to &nbsp;
+		var htmlIterator = new FCKHtmlIterator( innerHTML ) ;
+		var results = [] ;
+		htmlIterator.Each( function( isTag, value )
+			{
+				if ( !isTag )
+				{
+					value = value.replace( /\n/g, '<BR>' ) ;
+					value = value.replace( /[ \t]{2,}/g,
+							function ( match )
+							{
+								return new Array( match.length ).join( '&nbsp;' ) + ' ' ;
+							} ) ;
+				}
+				results.push( value ) ;
+			} ) ;
+		newBlock.innerHTML = results.join( '' ) ;
+		return newBlock ;
+	},
+
+	/**
+	 * Converting from a non-PRE block to a PRE block in formatting operations.
+	 */
+	_ToPre : function( doc, block, newBlock )
+	{
+		// Handle converting from a regular block to a <pre> block.
+		var innerHTML = block.innerHTML.Trim() ;
+
+		// 1. Delete ANSI whitespaces immediately before and after <BR> because they are not visible.
+		// 2. Mark down any <BR /> nodes here so they can be turned into \n in the next step and avoid being compressed.
+		innerHTML = innerHTML.replace( /[ \t\r\n]*(<br[^>]*>)[ \t\r\n]*/gi, '<BR />' ) ;
+
+		// 3. Compress other ANSI whitespaces since they're only visible as one single space previously.
+		// 4. Convert &nbsp; to spaces since &nbsp; is no longer needed in <PRE>.
+		// 5. Convert any <BR /> to \n. This must not be done earlier because the \n would then get compressed.
+		var htmlIterator = new FCKHtmlIterator( innerHTML ) ;
+		var results = [] ;
+		htmlIterator.Each( function( isTag, value )
+			{
+				if ( !isTag )
+					value = value.replace( /([ \t\n\r]+|&nbsp;)/g, ' ' ) ;
+				else if ( isTag && value == '<BR />' )
+					value = '\n' ;
+				results.push( value ) ;
+			} ) ;
+
+		// Assigning innerHTML to <PRE> in IE causes all linebreaks to be reduced to spaces.
+		// Assigning outerHTML to <PRE> in IE doesn't work if the <PRE> isn't contained in another node
+		// since the node reference is changed after outerHTML assignment.
+		// So, we need some hacks to workaround IE bugs here.
+		if ( FCKBrowserInfo.IsIE )
+		{
+			var temp = doc.createElement( 'div' ) ;
+			temp.appendChild( newBlock ) ;
+			newBlock.outerHTML = '<PRE>\n' + results.join( '' ) + '</PRE>' ;
+			newBlock = temp.removeChild( temp.firstChild ) ;
+		}
+		else
+			newBlock.innerHTML = results.join( '' ) ;
+		return newBlock ;
+	},
+
 	/**
 	 * Apply an inline style to a FCKDomRange.
 	 *
@@ -747,33 +843,97 @@ FCKStyle.prototype =
 	 *	- Implement the "#" style handling.
 	 *	- Properly handle block containers like <div> and <blockquote>.
 	 */
-	_ApplyBlockStyle : function( range, selectIt )
+	_ApplyBlockStyle : function( range, selectIt, updateRange )
 	{
 		// Bookmark the range so we can re-select it after processing.
 		var bookmark ;
 
 		if ( selectIt )
-			bookmark = range.CreateBookmark( true ) ;
+			bookmark = range.CreateBookmark() ;
 
 		var iterator = new FCKDomRangeIterator( range ) ;
 		iterator.EnforceRealBlocks = true ;
 
 		var block ;
+		var doc = range.Window.document ;
+
+		var preBlocks = [] ;
+		var convertedPreBlocks = [] ;
+
 		while( ( block = iterator.GetNextParagraph() ) )		// Only one =
 		{
 			// Create the new node right before the current one.
-			var newBlock = block.parentNode.insertBefore( this.BuildElement( range.Window.document ), block ) ;
+			var newBlock = this.BuildElement( doc ) ;
 
 			// Move everything from the current node to the new one.
-			FCKDomTools.MoveChildren( block, newBlock ) ;
+			var newBlockIsPre = newBlock.nodeName.IEquals( 'pre' ) ;
+			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 ) ;
 
-			// Delete the current node.
+			// Replace the current block.
+			block.parentNode.insertBefore( newBlock, block ) ;
 			FCKDomTools.RemoveNode( block ) ;
 		}
 
+		// Merge adjacent <PRE> blocks for #1229.
+		for ( var i = 0 ; i < preBlocks.length - 1 ; i++ )
+		{
+			// Check if the next block in HTML equals the next <PRE> block generated.
+			if ( FCKDomTools.GetNextSourceElement( preBlocks[i], true, [], [], true ) != preBlocks[i+1] )
+				continue ;
+
+			// Merge the upper <PRE> block's content into the lower <PRE> block.
+			// Remove the upper <PRE> block.
+			preBlocks[i+1].innerHTML = preBlocks[i].innerHTML + '\n\n' + preBlocks[i+1].innerHTML ;
+			FCKDomTools.RemoveNode( preBlocks[i] ) ;
+		}
+
+		// Split converted <PRE> 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 <BR>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
+				}
+			}
+		}
+
 		// Re-select the original range.
 		if ( selectIt )
 			range.SelectBookmark( bookmark ) ;
+
+		if ( updateRange )
+			range.MoveToBookmark( bookmark ) ;
 	},
 
 	/**
@@ -786,7 +946,7 @@ FCKStyle.prototype =
 	 *    instead of:
 	 *        <span style="color: #ff0000;"><span style="background-color: #ffffff">XYZ</span></span>
 	 */
-	_ApplyInlineStyle : function( range, selectIt )
+	_ApplyInlineStyle : function( range, selectIt, updateRange )
 	{
 		var doc = range.Window.document ;
 
@@ -864,8 +1024,8 @@ FCKStyle.prototype =
 			if ( !nodeName || elementDTD[ nodeName ] )
 			{
 				// Check if the style element can be a child of the current
-				// node parent.
-				if ( ( FCK.DTD[ currentNode.parentNode.nodeName.toLowerCase() ] || FCK.DTD.span )[ elementName ] )
+				// node parent or if the element is not defined in the DTD.
+				if ( ( FCK.DTD[ currentNode.parentNode.nodeName.toLowerCase() ] || FCK.DTD.span )[ elementName ] || !FCK.DTD[ elementName ] )
 				{
 					// This node will be part of our range, so if it has not
 					// been started, place its start right before the node.
@@ -967,6 +1127,9 @@ FCKStyle.prototype =
 		// Re-select the original range.
 		if ( selectIt )
 			range.SelectBookmark( bookmark ) ;
+
+		if ( updateRange )
+			range.MoveToBookmark( bookmark ) ;
 	},
 
 	_FixBookmarkStart : function( startNode )