Ticket #2188: 2188.patch

editor/dialog/common/fck_dialog_common.js

@@ -190 +190 @@
         sOptions += ",left=" + iLeft ;
         sOptions += ",top=" + iTop ;
 
-        // The "PreserveSessionOnFileBrowser" because the above code could be
-        // blocked by popup blockers.
-        if ( oEditor.FCKConfig.PreserveSessionOnFileBrowser && oEditor.FCKBrowserInfo.IsIE )
-        {
-                // The following change has been made otherwise IE will open the file
-                // browser on a different server session (on some cases):
-                // http://support.microsoft.com/default.aspx?scid=kb;en-us;831678
-                // by Simone Chiaretta.
-                var oWindow = oEditor.window.open( url, 'FCKBrowseWindow', sOptions ) ;
-
-                if ( oWindow )
-                {
-                        // Detect Yahoo popup blocker.
-                        try
-                        {
-                                var sTest = oWindow.name ; // Yahoo returns "something", but we can't access it, so detect that and avoid strange errors for the user.
-                                oWindow.opener = window ;
-                        }
-                        catch(e)
-                        {
-                                alert( oEditor.FCKLang.BrowseServerBlocked ) ;
-                        }
-                }
-                else
-                        alert( oEditor.FCKLang.BrowseServerBlocked ) ;
-    }
-    else
-                window.open( url, 'FCKBrowseWindow', sOptions ) ;
+        window.open( url, 'FCKBrowseWindow', sOptions ) ;
 }
 
 /**

fckconfig.js

@@ -87 +87 @@
 FCKConfig.ToolbarStartExpanded  = true ;
 FCKConfig.ToolbarCanCollapse    = true ;
 FCKConfig.IgnoreEmptyParagraphValue = true ;
-FCKConfig.PreserveSessionOnFileBrowser = false ;
 FCKConfig.FloatingPanelsZIndex = 10000 ;
 FCKConfig.HtmlEncodeOutput = false ;
 

fckeditor.cfc

@@ -190 +190 @@
         lConfigKeys = lConfigKeys & ",FillEmptyBlocks,FormatSource,FormatOutput,FormatIndentator";
         lConfigKeys = lConfigKeys & ",StartupFocus,ForcePasteAsPlainText,AutoDetectPasteFromWord,ForceSimpleAmpersand";
         lConfigKeys = lConfigKeys & ",TabSpaces,ShowBorders,SourcePopup,ToolbarStartExpanded,ToolbarCanCollapse";
-        lConfigKeys = lConfigKeys & ",IgnoreEmptyParagraphValue,PreserveSessionOnFileBrowser,FloatingPanelsZIndex,TemplateReplaceAll,TemplateReplaceCheckbox";
+        lConfigKeys = lConfigKeys & ",IgnoreEmptyParagraphValue,FloatingPanelsZIndex,TemplateReplaceAll,TemplateReplaceCheckbox";
         lConfigKeys = lConfigKeys & ",ToolbarLocation,ToolbarSets,EnterMode,ShiftEnterMode,Keystrokes";
         lConfigKeys = lConfigKeys & ",ContextMenu,BrowserContextMenuOnCtrl,FontColors,FontNames,FontSizes";
         lConfigKeys = lConfigKeys & ",FontFormats,StylesXmlPath,TemplatesXmlPath,SpellChecker,IeSpellDownloadUrl";

fckeditor.cfm

@@ -97 +97 @@
                 lConfigKeys = lConfigKeys & ",FillEmptyBlocks,FormatSource,FormatOutput,FormatIndentator";
                 lConfigKeys = lConfigKeys & ",StartupFocus,ForcePasteAsPlainText,AutoDetectPasteFromWord,ForceSimpleAmpersand";
                 lConfigKeys = lConfigKeys & ",TabSpaces,ShowBorders,SourcePopup,ToolbarStartExpanded,ToolbarCanCollapse";
-                lConfigKeys = lConfigKeys & ",IgnoreEmptyParagraphValue,PreserveSessionOnFileBrowser,FloatingPanelsZIndex,TemplateReplaceAll,TemplateReplaceCheckbox";
+                lConfigKeys = lConfigKeys & ",IgnoreEmptyParagraphValue,FloatingPanelsZIndex,TemplateReplaceAll,TemplateReplaceCheckbox";
                 lConfigKeys = lConfigKeys & ",ToolbarLocation,ToolbarSets,EnterMode,ShiftEnterMode,Keystrokes";
                 lConfigKeys = lConfigKeys & ",ContextMenu,BrowserContextMenuOnCtrl,FontColors,FontNames,FontSizes";
                 lConfigKeys = lConfigKeys & ",FontFormats,StylesXmlPath,TemplatesXmlPath,SpellChecker,IeSpellDownloadUrl";