typo 5.0.3.98.1 → 5.1

data/public/javascripts/fckeditor/editor/_source/commandclasses/fckblockquotecommand.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 ==
  *
@@ -25,16 +25,59 @@ var FCKBlockQuoteCommand = function()
 {
 }
 
-FCKBlockQuoteCommand.prototype = 
+FCKBlockQuoteCommand.prototype =
 {
 	Execute : function()
 	{
 		FCKUndo.SaveUndoStep() ;
 
 		var state = this.GetState() ;
+
 		var range = new FCKDomRange( FCK.EditorWindow ) ;
 		range.MoveToSelection() ;
+
 		var bookmark = range.CreateBookmark() ;
+
+		// Kludge for #1592: if the bookmark nodes are in the beginning of
+		// blockquote, then move them to the nearest block element in the
+		// blockquote.
+		if ( FCKBrowserInfo.IsIE )
+		{
+			var bStart	= range.GetBookmarkNode( bookmark, true ) ;
+			var bEnd	= range.GetBookmarkNode( bookmark, false ) ;
+
+			var cursor ;
+
+			if ( bStart
+					&& bStart.parentNode.nodeName.IEquals( 'blockquote' )
+					&& !bStart.previousSibling )
+			{
+				cursor = bStart ;
+				while ( ( cursor = cursor.nextSibling ) )
+				{
+					if ( FCKListsLib.BlockElements[ cursor.nodeName.toLowerCase() ] )
+						FCKDomTools.MoveNode( bStart, cursor, true ) ;
+				}
+			}
+
+			if ( bEnd
+					&& bEnd.parentNode.nodeName.IEquals( 'blockquote' )
+					&& !bEnd.previousSibling )
+			{
+				cursor = bEnd ;
+				while ( ( cursor = cursor.nextSibling ) )
+				{
+					if ( FCKListsLib.BlockElements[ cursor.nodeName.toLowerCase() ] )
+					{
+						if ( cursor.firstChild == bStart )
+							FCKDomTools.InsertAfterNode( bStart, bEnd ) ;
+						else
+							FCKDomTools.MoveNode( bEnd, cursor, true ) ;
+					}
+				}
+			}
+		}
+
 		var iterator = new FCKDomRangeIterator( range ) ;
 		var block ;
 
@@ -45,6 +88,19 @@ FCKBlockQuoteCommand.prototype =
 			while ( ( block = iterator.GetNextParagraph() ) )
 				paragraphs.push( block ) ;
 
+			// If no paragraphs, create one from the current selection position.
+			if ( paragraphs.length < 1 )
+			{
+				para = range.Window.document.createElement( FCKConfig.EnterMode.IEquals( 'p' ) ? 'p' : 'div' ) ;
+				range.InsertNode( para ) ;
+				para.appendChild( range.Window.document.createTextNode( '\ufeff' ) ) ;
+				range.MoveToBookmark( bookmark ) ;
+				range.MoveToNodeContents( para ) ;
+				range.Collapse( true ) ;
+				bookmark = range.CreateBookmark() ;
+				paragraphs.push( para ) ;
+			}
+
 			// Make sure all paragraphs have the same parent.
 			var commonParent = paragraphs[0].parentNode ;
 			var tmp = [] ;
@@ -70,7 +126,7 @@ FCKBlockQuoteCommand.prototype =
 				block = tmp.shift() ;
 				if ( block.nodeName.IEquals( 'blockquote' ) )
 				{
-					var docFrag = block.ownerDocument.createDocumentFragment() ;
+					var docFrag = FCKTools.GetElementDocument( block ).createDocumentFragment() ;
 					while ( block.firstChild )
 					{
 						docFrag.appendChild( block.removeChild( block.firstChild ) ) ;
@@ -147,17 +203,17 @@ FCKBlockQuoteCommand.prototype =
 					var firstTime = true ;
 					if ( node.nodeName.IEquals( 'div' ) )
 					{
-						var docFrag = node.ownerDocument.createDocumentFragment() ;
-						var needBeginBr = firstTime && node.previousSibling && 
+						var docFrag = FCKTools.GetElementDocument( node ).createDocumentFragment() ;
+						var needBeginBr = firstTime && node.previousSibling &&
 							!FCKListsLib.BlockBoundaries[node.previousSibling.nodeName.toLowerCase()] ;
 						if ( firstTime && needBeginBr )
-							docFrag.appendChild( node.ownerDocument.createElement( 'br' ) ) ;
-						var needEndBr = node.nextSibling && 
+							docFrag.appendChild( FCKTools.GetElementDocument( node ).createElement( 'br' ) ) ;
+						var needEndBr = node.nextSibling &&
 							!FCKListsLib.BlockBoundaries[node.nextSibling.nodeName.toLowerCase()] ;
 						while ( node.firstChild )
 							docFrag.appendChild( node.removeChild( node.firstChild ) ) ;
 						if ( needEndBr )
-							docFrag.appendChild( node.ownerDocument.createElement( 'br' ) ) ;
+							docFrag.appendChild( FCKTools.GetElementDocument( node ).createElement( 'br' ) ) ;
 						node.parentNode.replaceChild( docFrag, node ) ;
 						firstTime = false ;
 					}

data/public/javascripts/fckeditor/editor/_source/commandclasses/fckcorestylecommand.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 ==
  *
@@ -49,6 +49,8 @@
 
 	GetState : function()
 	{
+		if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+			return FCK_TRISTATE_DISABLED ;
 		return this.IsActive ? FCK_TRISTATE_ON : FCK_TRISTATE_OFF ;
 	},
 

data/public/javascripts/fckeditor/editor/_source/commandclasses/fckfitwindow.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 ==
  *
@@ -155,7 +155,7 @@ FCKFitWindow.prototype.Execute = function()
 	//lost, so we must reset it. Also, the cursor position and selection are
 	//also lost, even if you comment the following line (MakeEditable).
 	// if ( FCKBrowserInfo.IsGecko10 )	// Initially I thought it was a FF 1.0 only problem.
-	if ( FCK.EditMode == FCK_EDITMODE_WYSIWYG ) 
+	if ( FCK.EditMode == FCK_EDITMODE_WYSIWYG )
 		FCK.EditingArea.MakeEditable() ;
 
 	FCK.Focus() ;

data/public/javascripts/fckeditor/editor/_source/commandclasses/fckindentcommands.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 ==
  *
@@ -57,8 +57,8 @@ FCKIndentCommand.prototype =
 		// Two cases to handle here: either we're in a list, or not.
 		// If we're in a list, then the indent/outdent operations would be done on the list nodes.
 		// Otherwise, apply the operation on the nearest block nodes.
-		var nearestListBlock = FCKDomTools.GetCommonParentNode( range.StartNode || range.StartContainer , 
-				range.EndNode || range.EndContainer, 
+		var nearestListBlock = FCKDomTools.GetCommonParentNode( range.StartNode || range.StartContainer ,
+				range.EndNode || range.EndContainer,
 				['ul', 'ol'] ) ;
 		if ( nearestListBlock )
 			this._IndentList( range, nearestListBlock ) ;
@@ -133,6 +133,8 @@ FCKIndentCommand.prototype =
 	_IndentBlock : function( range )
 	{
 		var iterator = new FCKDomRangeIterator( range ) ;
+		iterator.EnforceRealBlocks = true ;
+
 		range.Expand( 'block_contents' ) ;
 		var commonParents = FCKDomTools.GetCommonParents( range.StartContainer, range.EndContainer ) ;
 		var nearestParent = commonParents[commonParents.length - 1] ;

data/public/javascripts/fckeditor/editor/_source/commandclasses/fckjustifycommands.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 ==
  *
@@ -39,13 +39,13 @@ var FCKJustifyCommand = function( alignValue )
 			switch ( alignValue )
 			{
 				case 'left' :
-					return classes[0] ;
+					return classes[0] || null ;
 				case 'center' :
-					return classes[1] ;
+					return classes[1] || null ;
 				case 'right' :
-					return classes[2] ;
+					return classes[2] || null ;
 				case 'justify' :
-					return classes[3] ;
+					return classes[3] || null ;
 			}
 		}
 		return null ;
@@ -99,7 +99,7 @@ FCKJustifyCommand.prototype =
 		// Store a bookmark of the selection since the paragraph iterator might
 		// change the DOM tree and break selections.
 		var bookmark = range.CreateBookmark() ;
-		
+
 		var cssClassName = this._CssClassName ;
 
 		// Apply alignment setting for each paragraph.

data/public/javascripts/fckeditor/editor/_source/commandclasses/fcklistcommands.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 ==
  *
@@ -145,7 +145,7 @@ FCKListCommand.prototype =
 				if ( rangeQueue == null )
 				{
 					rangeQueue = [] ;
-					var selectionObject = FCK.EditorWindow.getSelection() ;
+					var selectionObject = FCKSelection.GetSelection() ;
 					if ( selectionObject && listGroups.length == 0 )
 						rangeQueue.push( selectionObject.getRangeAt( 0 ) ) ;
 					for ( var i = 1 ; selectionObject && i < selectionObject.rangeCount ; i++ )
@@ -252,7 +252,7 @@ FCKListCommand.prototype =
 			selectedListItems.push( itemNode ) ;
 			FCKDomTools.SetElementMarker( markerObj, itemNode, '_FCK_ListItem_Processed', true ) ;
 		}
-		var fakeParent = groupObj.root.ownerDocument.createElement( this.TagName ) ;
+		var fakeParent = FCKTools.GetElementDocument( groupObj.root ).createElement( this.TagName ) ;
 		for ( var i = 0 ; i < selectedListItems.length ; i++ )
 		{
 			var listIndex = selectedListItems[i]._FCK_ListArray_Index ;
@@ -270,7 +270,7 @@ FCKListCommand.prototype =
 	_CreateList : function( groupObj, listsCreated )
 	{
 		var contents = groupObj.contents ;
-		var doc = groupObj.root.ownerDocument ;
+		var doc = FCKTools.GetElementDocument( groupObj.root ) ;
 		var listContents = [] ;
 
 		// It is possible to have the contents returned by DomRangeIterator to be the same as the root.

data/public/javascripts/fckeditor/editor/_source/commandclasses/fcknamedcommand.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 ==
  *
@@ -33,5 +33,7 @@ FCKNamedCommand.prototype.Execute = function()
 
 FCKNamedCommand.prototype.GetState = function()
 {
+	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+		return FCK_TRISTATE_DISABLED ;
 	return FCK.GetNamedCommandState( this.Name ) ;
 }

data/public/javascripts/fckeditor/editor/_source/commandclasses/fckpasteplaintextcommand.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 ==
  *
@@ -34,5 +34,7 @@ FCKPastePlainTextCommand.prototype.Execute = function()
 
 FCKPastePlainTextCommand.prototype.GetState = function()
 {
+	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+		return FCK_TRISTATE_DISABLED ;
 	return FCK.GetNamedCommandState( 'Paste' ) ;
 }

data/public/javascripts/fckeditor/editor/_source/commandclasses/fckpastewordcommand.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 ==
  *
@@ -33,7 +33,7 @@ FCKPasteWordCommand.prototype.Execute = function()
 
 FCKPasteWordCommand.prototype.GetState = function()
 {
-	if ( FCKConfig.ForcePasteAsPlainText )
+	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG || FCKConfig.ForcePasteAsPlainText )
 		return FCK_TRISTATE_DISABLED ;
 	else
 		return FCK.GetNamedCommandState( 'Paste' ) ;

data/public/javascripts/fckeditor/editor/_source/commandclasses/fckremoveformatcommand.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 ==
  *
@@ -42,4 +42,4 @@
 	{
 		return FCK.EditorWindow ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ;
 	}
- };
+ };

data/public/javascripts/fckeditor/editor/_source/commandclasses/fckshowblocks.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 ==
  *
@@ -52,14 +52,12 @@ FCKShowBlockCommand.prototype.GetState = function()
 	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
 		return FCK_TRISTATE_DISABLED ;
 
-	// On some cases FCK.EditorDocument.body is not yet available, so try/catch.
-	try
-	{
-		if ( /FCK__ShowBlocks(?:\s|$)/.test( FCK.EditorDocument.body.className ) )
-			return FCK_TRISTATE_ON ;
-	}
-	catch (e)
-	{}
+	// On some cases FCK.EditorDocument.body is not yet available
+	if ( !FCK.EditorDocument )
+		return FCK_TRISTATE_OFF ;
+
+	if ( /FCK__ShowBlocks(?:\s|$)/.test( FCK.EditorDocument.body.className ) )
+		return FCK_TRISTATE_ON ;
 
 	return FCK_TRISTATE_OFF ;
 }

data/public/javascripts/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_gecko.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,5 +35,7 @@ FCKSpellCheckCommand.prototype.Execute = function()
 
 FCKSpellCheckCommand.prototype.GetState = function()
 {
+	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+		return FCK_TRISTATE_DISABLED ;
 	return this.IsEnabled ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ;
-}
+}

data/public/javascripts/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_ie.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 ==
  *
@@ -63,5 +63,7 @@ FCKSpellCheckCommand.prototype._RunIeSpell = function()
 
 FCKSpellCheckCommand.prototype.GetState = function()
 {
+	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+		return FCK_TRISTATE_DISABLED ;
 	return this.IsEnabled ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ;
-}
+}

data/public/javascripts/fckeditor/editor/_source/commandclasses/fckstylecommand.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 ==
  *
@@ -27,7 +27,7 @@ var FCKStyleCommand = function()
 FCKStyleCommand.prototype =
 {
 	Name : 'Style',
-	
+
 	Execute : function( styleName, styleComboItem )
 	{
 		FCKUndo.SaveUndoStep() ;
@@ -45,7 +45,7 @@ FCKStyleCommand.prototype =
 
 	GetState : function()
 	{
-		if ( !FCK.EditorDocument )
+		if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG || !FCK.EditorDocument )
 			return FCK_TRISTATE_DISABLED ;
 
 		if ( FCKSelection.GetType() == 'Control' )

data/public/javascripts/fckeditor/editor/_source/commandclasses/fcktablecommand.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 @@ FCKTableCommand.prototype.Execute = function()
 	{
 		switch ( this.Name )
 		{
-			case 'TableMergeRight' : 
+			case 'TableMergeRight' :
 				return FCKTableHandler.MergeRight() ;
 			case 'TableMergeDown' :
 				return FCKTableHandler.MergeDown() ;
@@ -88,7 +88,7 @@ FCKTableCommand.prototype.GetState = function()
 				else
 					return FCK_TRISTATE_DISABLED ;
 			case 'TableMergeCells' :
-				if ( FCKTableHandler.CheckIsSelectionRectangular() 
+				if ( FCKTableHandler.CheckIsSelectionRectangular()
 						&& FCKTableHandler.GetSelectedCells().length > 1 )
 					return FCK_TRISTATE_OFF ;
 				else
@@ -102,5 +102,5 @@ FCKTableCommand.prototype.GetState = function()
 		}
 	}
 	else
-		return FCK_TRISTATE_DISABLED; 
+		return FCK_TRISTATE_DISABLED;
 }

data/public/javascripts/fckeditor/editor/_source/commandclasses/fcktextcolorcommand.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 ==
  *
@@ -39,9 +39,10 @@ var FCKTextColorCommand = function( type )
 		oWindow = window.parent ;
 
 	this._Panel = new FCKPanel( oWindow ) ;
-	this._Panel.AppendStyleSheet( FCKConfig.SkinPath + 'fck_editor.css' ) ;
+	this._Panel.AppendStyleSheet( FCKConfig.SkinEditorCSS ) ;
 	this._Panel.MainNode.className = 'FCK_Panel' ;
 	this._CreatePanelBody( this._Panel.Document, this._Panel.MainNode ) ;
+	FCK.ToolbarSet.ToolbarItems.GetItem( this.Name ).RegisterPanel( this._Panel ) ;
 
 	FCKTools.DisableSelection( this._Panel.Document.body ) ;
 }
@@ -54,6 +55,8 @@ FCKTextColorCommand.prototype.Execute = function( panelX, panelY, relElement )
 
 FCKTextColorCommand.prototype.SetColor = function( color )
 {
+	FCKUndo.SaveUndoStep() ;
+
 	var style = FCKStyles.GetStyle( '_FCK_' +
 		( this.Type == 'ForeColor' ? 'Color' : 'BackColor' ) ) ;
 
@@ -65,12 +68,16 @@ FCKTextColorCommand.prototype.SetColor = function( color )
 		FCKStyles.ApplyStyle( style ) ;
 	}
 
+	FCKUndo.SaveUndoStep() ;
+
 	FCK.Focus() ;
 	FCK.Events.FireEvent( 'OnSelectionChange' ) ;
 }
 
 FCKTextColorCommand.prototype.GetState = function()
 {
+	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+		return FCK_TRISTATE_DISABLED ;
 	return FCK_TRISTATE_OFF ;
 }
 
@@ -102,7 +109,8 @@ function FCKTextColorCommand_MoreOnClick( ev, command )
 {
 	this.className = 'ColorDeselected' ;
 	command._Panel.Hide() ;
-	FCKDialog.OpenDialog( 'FCKDialog_Color', FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 400, 330, FCKTools.Hitch(command, 'SetColor') ) ;
+	FCKDialog.OpenDialog( 'FCKDialog_Color', FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 410, 320,
+			FCKTools.Bind( command, command.SetColor ) ) ;
 }
 
 FCKTextColorCommand.prototype._CreatePanelBody = function( targetDocument, targetDiv )
@@ -141,7 +149,8 @@ FCKTextColorCommand.prototype._CreatePanelBody = function( targetDocument, targe
 
 	FCKTools.AddEventListenerEx( oDiv, 'click', FCKTextColorCommand_AutoOnClick, this ) ;
 
-	if ( FCKBrowserInfo.IsSafari )
+	// Dirty hack for Opera, Safari and Firefox 3.
+	if ( !FCKBrowserInfo.IsIE )
 		oDiv.style.width = '96%' ;
 
 	// Create an array of colors based on the configuration file.
@@ -153,16 +162,24 @@ FCKTextColorCommand.prototype._CreatePanelBody = function( targetDocument, targe
 	{
 		var oRow = oTable.insertRow(-1) ;
 
-		for ( var i = 0 ; i < 8 && iCounter < aColors.length ; i++, iCounter++ )
+		for ( var i = 0 ; i < 8 ; i++, iCounter++ )
 		{
-			var colorParts = aColors[iCounter].split('/') ;
-			var colorValue = '#' + colorParts[0] ;
-			var colorName = colorParts[1] || colorValue ;
+			// The div will be created even if no more colors are available.
+			// Extra divs will be hidden later in the code. (#1597)
+			if ( iCounter < aColors.length )
+			{
+				var colorParts = aColors[iCounter].split('/') ;
+				var colorValue = '#' + colorParts[0] ;
+				var colorName = colorParts[1] || colorValue ;
+			}
 
 			oDiv = oRow.insertCell(-1).appendChild( CreateSelectionDiv() ) ;
 			oDiv.innerHTML = '<div class="ColorBoxBorder"><div class="ColorBox" style="background-color: ' + colorValue + '"></div></div>' ;
 
-			FCKTools.AddEventListenerEx( oDiv, 'click', FCKTextColorCommand_OnClick, [ this, colorName ] ) ;
+			if ( iCounter >= aColors.length )
+				oDiv.style.visibility = 'hidden' ;
+			else
+				FCKTools.AddEventListenerEx( oDiv, 'click', FCKTextColorCommand_OnClick, [ this, colorName ] ) ;
 		}
 	}
 
@@ -178,6 +195,7 @@ FCKTextColorCommand.prototype._CreatePanelBody = function( targetDocument, targe
 		FCKTools.AddEventListenerEx( oDiv, 'click', FCKTextColorCommand_MoreOnClick, this ) ;
 	}
 
-	if ( FCKBrowserInfo.IsSafari )
+	// Dirty hack for Opera, Safari and Firefox 3.
+	if ( !FCKBrowserInfo.IsIE )
 		oDiv.style.width = '96%' ;
 }