Index: /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fck_othercommands.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fck_othercommands.js	(revision 1354)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fck_othercommands.js	(revision 1355)
@@ -211,4 +211,6 @@
 FCKUndoCommand.prototype.GetState = function()
 {
+	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+		return FCK_TRISTATE_DISABLED ;
 	return ( FCKUndo.CheckUndoState() ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ) ;
 }
@@ -227,4 +229,6 @@
 FCKRedoCommand.prototype.GetState = function()
 {
+	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+		return FCK_TRISTATE_DISABLED ;
 	return ( FCKUndo.CheckRedoState() ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ) ;
 }
@@ -264,4 +268,6 @@
 FCKPageBreakCommand.prototype.GetState = function()
 {
+	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+		return FCK_TRISTATE_DISABLED ;
 	return 0 ; // FCK_TRISTATE_OFF
 }
@@ -293,4 +299,6 @@
 FCKUnlinkCommand.prototype.GetState = function()
 {
+	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+		return FCK_TRISTATE_DISABLED ;
 	var state = FCK.GetNamedCommandState( this.Name ) ;
 
@@ -338,4 +346,6 @@
 FCKSelectAllCommand.prototype.GetState = function()
 {
+	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+		return FCK_TRISTATE_DISABLED ;
 	return FCK_TRISTATE_OFF ;
 }
@@ -359,4 +369,6 @@
 	GetState : function()
 	{
+		if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+			return FCK_TRISTATE_DISABLED ;
 		return FCK.GetNamedCommandState( 'Paste' ) ;
 	}
@@ -379,4 +391,6 @@
 	GetState : function()
 	{
+		if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+			return FCK_TRISTATE_DISABLED ;
 		return FCK.GetNamedCommandState( 'InsertHorizontalRule' ) ;
 	}
@@ -398,4 +412,6 @@
 	GetState : function()
 	{
+		if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+			return FCK_TRISTATE_DISABLED ;
 		// Strangely, the cut command happens to have the correct states for both Copy and Cut in all browsers.
 		return FCK.GetNamedCommandState( 'Cut' ) ;
@@ -467,4 +483,6 @@
 	GetState : function()
 	{
+		if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+			return FCK_TRISTATE_DISABLED ;
 		return FCK.GetNamedCommandState( 'Unlink') ;
 	}
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fckcorestylecommand.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fckcorestylecommand.js	(revision 1354)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fckcorestylecommand.js	(revision 1355)
@@ -50,4 +50,6 @@
 	GetState : function()
 	{
+		if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+			return FCK_TRISTATE_DISABLED ;
 		return this.IsActive ? FCK_TRISTATE_ON : FCK_TRISTATE_OFF ;
 	},
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fcknamedcommand.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fcknamedcommand.js	(revision 1354)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fcknamedcommand.js	(revision 1355)
@@ -34,4 +34,6 @@
 FCKNamedCommand.prototype.GetState = function()
 {
+	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+		return FCK_TRISTATE_DISABLED ;
 	return FCK.GetNamedCommandState( this.Name ) ;
 }
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fckpasteplaintextcommand.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fckpasteplaintextcommand.js	(revision 1354)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fckpasteplaintextcommand.js	(revision 1355)
@@ -35,4 +35,6 @@
 FCKPastePlainTextCommand.prototype.GetState = function()
 {
+	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+		return FCK_TRISTATE_DISABLED ;
 	return FCK.GetNamedCommandState( 'Paste' ) ;
 }
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fckpastewordcommand.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fckpastewordcommand.js	(revision 1354)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fckpastewordcommand.js	(revision 1355)
@@ -34,5 +34,5 @@
 FCKPasteWordCommand.prototype.GetState = function()
 {
-	if ( FCKConfig.ForcePasteAsPlainText )
+	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG || FCKConfig.ForcePasteAsPlainText )
 		return FCK_TRISTATE_DISABLED ;
 	else
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fckspellcheckcommand_gecko.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fckspellcheckcommand_gecko.js	(revision 1354)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fckspellcheckcommand_gecko.js	(revision 1355)
@@ -36,4 +36,6 @@
 FCKSpellCheckCommand.prototype.GetState = function()
 {
+	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+		return FCK_TRISTATE_DISABLED ;
 	return this.IsEnabled ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ;
 }
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fckspellcheckcommand_ie.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fckspellcheckcommand_ie.js	(revision 1354)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fckspellcheckcommand_ie.js	(revision 1355)
@@ -64,4 +64,6 @@
 FCKSpellCheckCommand.prototype.GetState = function()
 {
+	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+		return FCK_TRISTATE_DISABLED ;
 	return this.IsEnabled ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ;
 }
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fckstylecommand.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fckstylecommand.js	(revision 1354)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fckstylecommand.js	(revision 1355)
@@ -46,5 +46,5 @@
 	GetState : function()
 	{
-		if ( !FCK.EditorDocument )
+		if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG || !FCK.EditorDocument )
 			return FCK_TRISTATE_DISABLED ;
 
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fcktextcolorcommand.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fcktextcolorcommand.js	(revision 1354)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fcktextcolorcommand.js	(revision 1355)
@@ -76,4 +76,6 @@
 FCKTextColorCommand.prototype.GetState = function()
 {
+	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+		return FCK_TRISTATE_DISABLED ;
 	return FCK_TRISTATE_OFF ;
 }
Index: /FCKeditor/branches/features/floating_dialog/editor/filemanager/connectors/aspx/connector.aspx
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/filemanager/connectors/aspx/connector.aspx	(revision 1354)
+++ /FCKeditor/branches/features/floating_dialog/editor/filemanager/connectors/aspx/connector.aspx	(revision 1355)
@@ -1,3 +1,3 @@
-<%@ Page Language="c#" Trace="false" Inherits="FredCK.FCKeditorV2.FileBrowser.Connector" AutoEventWireup="false" %>
+<%@ Page Language="c#" Trace="false" Inherits="FredCK.FCKeditorV2.FileBrowser.Connector" AutoEventWireup="false" %>
 <%@ Register Src="config.ascx" TagName="Config" TagPrefix="FCKeditor" %>
 <%--
Index: /FCKeditor/branches/features/floating_dialog/editor/filemanager/connectors/aspx/upload.aspx
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/filemanager/connectors/aspx/upload.aspx	(revision 1354)
+++ /FCKeditor/branches/features/floating_dialog/editor/filemanager/connectors/aspx/upload.aspx	(revision 1355)
@@ -1,3 +1,3 @@
-<%@ Page Language="c#" Trace="false" Inherits="FredCK.FCKeditorV2.FileBrowser.Uploader" AutoEventWireup="false" %>
+<%@ Page Language="c#" Trace="false" Inherits="FredCK.FCKeditorV2.FileBrowser.Uploader" AutoEventWireup="false" %>
 <%@ Register Src="config.ascx" TagName="Config" TagPrefix="FCKeditor" %>
 <%--