Changeset 2019

Timestamp:

2008-05-27 12:00:08 (22 months ago)

Author:

martinkou

Message:

Fixed #2188 : PreserveSessionOnFileBrowser is now removed as it was made obsolete with 2.6.

Location:

FCKeditor/trunk

Files:

• editor/dialog/common/fck_dialog_common.js (modified) (1 diff)
• fckconfig.js (modified) (1 diff)
• fckeditor.cfc (modified) (1 diff)
• fckeditor.cfm (modified) (1 diff)
• _whatsnew.html (modified) (1 diff)

FCKeditor/trunk/editor/dialog/common/fck_dialog_common.js

@@ -191 +191 @@
         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 ) ;
 }
 

FCKeditor/trunk/fckconfig.js

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

FCKeditor/trunk/fckeditor.cfc

@@ -191 +191 @@
         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";

FCKeditor/trunk/fckeditor.cfm

@@ -98 +98 @@
                 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";

FCKeditor/trunk/_whatsnew.html

@@ -100 +100 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1691">#1691</a>] Creation of links in Safari
                         failed if there was no selection.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2188">#2188</a>] PreserveSessionOnFileBrowser 
+                        is now removed as it was made obsolete with 2.6.</li>
         </ul>
         <h3>