Ticket #1607: 1607.patch

editor/_source/classes/fckeditingarea.js

@@ -211 +211 @@
                         // Tell Gecko to use or not the <SPAN> tag for the bold, italic and underline.
                         try
                         {
-                                oDoc.execCommand( 'styleWithCSS', false, FCKConfig.GeckoUseSPAN ) ;
+                                oDoc.execCommand( 'styleWithCSS', false, false ) ;
                         }
                         catch (e)
                         {
                                 // As evidenced here, useCSS is deprecated in favor of styleWithCSS:
                                 // http://www.mozilla.org/editor/midas-spec.html
-                                oDoc.execCommand( 'useCSS', false, !FCKConfig.GeckoUseSPAN ) ;
+                                oDoc.execCommand( 'useCSS', false, true ) ;
                         }
 
                         // Analyzing Firefox 1.5 source code, it seams that there is support for a

fckconfig.js

@@ -73 +73 @@
 FCKConfig.FormatOutput          = true ;
 FCKConfig.FormatIndentator      = '    ' ;
 
-FCKConfig.GeckoUseSPAN  = false ;
 FCKConfig.StartupFocus  = false ;
 FCKConfig.ForcePasteAsPlainText = false ;
 FCKConfig.AutoDetectPasteFromWord = true ;      // IE only.

fckeditor.cfc

@@ -188 +188 @@
         lConfigKeys = lConfigKeys & ",PreloadImages,PluginsPath,AutoDetectLanguage,DefaultLanguage,ContentLangDirection";
         lConfigKeys = lConfigKeys & ",ProcessHTMLEntities,IncludeLatinEntities,IncludeGreekEntities,ProcessNumericEntities,AdditionalNumericEntities";
         lConfigKeys = lConfigKeys & ",FillEmptyBlocks,FormatSource,FormatOutput,FormatIndentator";
-        lConfigKeys = lConfigKeys & ",GeckoUseSPAN,StartupFocus,ForcePasteAsPlainText,AutoDetectPasteFromWord,ForceSimpleAmpersand";
+        lConfigKeys = lConfigKeys & ",StartupFocus,ForcePasteAsPlainText,AutoDetectPasteFromWord,ForceSimpleAmpersand";
         lConfigKeys = lConfigKeys & ",TabSpaces,ShowBorders,SourcePopup,ToolbarStartExpanded,ToolbarCanCollapse";
         lConfigKeys = lConfigKeys & ",IgnoreEmptyParagraphValue,PreserveSessionOnFileBrowser,FloatingPanelsZIndex,TemplateReplaceAll,TemplateReplaceCheckbox";
         lConfigKeys = lConfigKeys & ",ToolbarLocation,ToolbarSets,EnterMode,ShiftEnterMode,Keystrokes";

fckeditor.cfm

@@ -95 +95 @@
                 lConfigKeys = lConfigKeys & ",PreloadImages,PluginsPath,AutoDetectLanguage,DefaultLanguage,ContentLangDirection";
                 lConfigKeys = lConfigKeys & ",ProcessHTMLEntities,IncludeLatinEntities,IncludeGreekEntities,ProcessNumericEntities,AdditionalNumericEntities";
                 lConfigKeys = lConfigKeys & ",FillEmptyBlocks,FormatSource,FormatOutput,FormatIndentator";
-                lConfigKeys = lConfigKeys & ",GeckoUseSPAN,StartupFocus,ForcePasteAsPlainText,AutoDetectPasteFromWord,ForceSimpleAmpersand";
+                lConfigKeys = lConfigKeys & ",StartupFocus,ForcePasteAsPlainText,AutoDetectPasteFromWord,ForceSimpleAmpersand";
                 lConfigKeys = lConfigKeys & ",TabSpaces,ShowBorders,SourcePopup,ToolbarStartExpanded,ToolbarCanCollapse";
                 lConfigKeys = lConfigKeys & ",IgnoreEmptyParagraphValue,PreserveSessionOnFileBrowser,FloatingPanelsZIndex,TemplateReplaceAll,TemplateReplaceCheckbox";
                 lConfigKeys = lConfigKeys & ",ToolbarLocation,ToolbarSets,EnterMode,ShiftEnterMode,Keystrokes";