Changeset 712

Timestamp:

2007-08-23 11:22:52 (3 years ago)

Author:

martinkou

Message:

Fix for #212 : Made the "Show Blocks" state persistent across Source/WYSIWYG mode switches.
Fix for #212 : Added FCKConfig.StartupShowBlocks option.

Location:

FCKeditor/trunk

Files:

• editor/_source/commandclasses/fckshowblocks.js (modified) (2 diffs)
• editor/_source/internals/fckcommands.js (modified) (1 diff)
• editor/_source/internals/fck.js (modified) (2 diffs)
• fckconfig.js (modified) (1 diff)

FCKeditor/trunk/editor/_source/commandclasses/fckshowblocks.js

@@ -22 +22 @@
  */
 
-var FCKShowBlockCommand = function( name )
+var FCKShowBlockCommand = function( name, defaultState )
 {
         this.Name = name ;
+        if ( defaultState != undefined )
+                this._SavedState = defaultState ;
+        else
+                this._SavedState = null ;
 }
 
@@ -60 +64 @@
         return FCK_TRISTATE_OFF ;
 }
+
+FCKShowBlockCommand.prototype.SaveState = function()
+{
+        this._SavedState = this.GetState() ;
+}
+
+FCKShowBlockCommand.prototype.RestoreState = function()
+{
+        if ( this._SavedState != null && this.GetState() != this._SavedState )
+                this.Execute() ;
+}

FCKeditor/trunk/editor/_source/internals/fckcommands.js

@@ -116 +116 @@
                 case 'InsertOrderedList' : oCommand = new FCKListCommand( 'insertorderedlist' ) ; break ;
                 case 'InsertUnorderedList' : oCommand = new FCKListCommand( 'insertunorderedlist' ) ; break ;
-                case 'ShowBlocks' : oCommand = new FCKShowBlockCommand( 'ShowBlocks' ) ; break ;
+                case 'ShowBlocks' : oCommand = new FCKShowBlockCommand( 'ShowBlocks', FCKConfig.StartupShowBlocks ? FCK_TRISTATE_ON : FCK_TRISTATE_OFF ) ; break ;
 
                 // Generic Undefined command (usually used when a command is under development).

FCKeditor/trunk/editor/_source/internals/fck.js

@@ -550 +550 @@
                 if ( bIsWysiwyg )
                 {
+                        FCKCommands.GetCommand( 'ShowBlocks' ).SaveState() ;
                         if ( !noUndo && FCKBrowserInfo.IsIE )
                                 FCKUndo.SaveUndoStep() ;
@@ -813 +814 @@
         FCK.OnAfterSetHTML() ;
 
+        // Restore show blocks status.
+        FCKCommands.GetCommand( 'ShowBlocks' ).RestoreState() ;
+
         // Check if it is not a startup call, otherwise complete the startup.
         if ( FCK.Status != FCK_STATUS_NOTLOADED )

FCKeditor/trunk/fckconfig.js

@@ -39 +39 @@
 
 FCKConfig.FullPage = false ;
+
+// The following option determines whether the "Show Blocks" feature is enabled or not at startup.
+FCKConfig.StartupShowBlocks = false ;
 
 FCKConfig.Debug = false ;