Ticket #2188: 2188.patch

File 2188.patch, 3.9 KB (added by Martin Kou, 11 years ago)
  • editor/dialog/common/fck_dialog_common.js

     
    190190        sOptions += ",left=" + iLeft ;
    191191        sOptions += ",top=" + iTop ;
    192192
    193         // The "PreserveSessionOnFileBrowser" because the above code could be
    194         // blocked by popup blockers.
    195         if ( oEditor.FCKConfig.PreserveSessionOnFileBrowser && oEditor.FCKBrowserInfo.IsIE )
    196         {
    197                 // The following change has been made otherwise IE will open the file
    198                 // browser on a different server session (on some cases):
    199                 // http://support.microsoft.com/default.aspx?scid=kb;en-us;831678
    200                 // by Simone Chiaretta.
    201                 var oWindow = oEditor.window.open( url, 'FCKBrowseWindow', sOptions ) ;
    202 
    203                 if ( oWindow )
    204                 {
    205                         // Detect Yahoo popup blocker.
    206                         try
    207                         {
    208                                 var sTest = oWindow.name ; // Yahoo returns "something", but we can't access it, so detect that and avoid strange errors for the user.
    209                                 oWindow.opener = window ;
    210                         }
    211                         catch(e)
    212                         {
    213                                 alert( oEditor.FCKLang.BrowseServerBlocked ) ;
    214                         }
    215                 }
    216                 else
    217                         alert( oEditor.FCKLang.BrowseServerBlocked ) ;
    218     }
    219     else
    220                 window.open( url, 'FCKBrowseWindow', sOptions ) ;
     193        window.open( url, 'FCKBrowseWindow', sOptions ) ;
    221194}
    222195
    223196/**
  • fckconfig.js

     
    8787FCKConfig.ToolbarStartExpanded  = true ;
    8888FCKConfig.ToolbarCanCollapse    = true ;
    8989FCKConfig.IgnoreEmptyParagraphValue = true ;
    90 FCKConfig.PreserveSessionOnFileBrowser = false ;
    9190FCKConfig.FloatingPanelsZIndex = 10000 ;
    9291FCKConfig.HtmlEncodeOutput = false ;
    9392
  • fckeditor.cfc

     
    190190        lConfigKeys = lConfigKeys & ",FillEmptyBlocks,FormatSource,FormatOutput,FormatIndentator";
    191191        lConfigKeys = lConfigKeys & ",StartupFocus,ForcePasteAsPlainText,AutoDetectPasteFromWord,ForceSimpleAmpersand";
    192192        lConfigKeys = lConfigKeys & ",TabSpaces,ShowBorders,SourcePopup,ToolbarStartExpanded,ToolbarCanCollapse";
    193         lConfigKeys = lConfigKeys & ",IgnoreEmptyParagraphValue,PreserveSessionOnFileBrowser,FloatingPanelsZIndex,TemplateReplaceAll,TemplateReplaceCheckbox";
     193        lConfigKeys = lConfigKeys & ",IgnoreEmptyParagraphValue,FloatingPanelsZIndex,TemplateReplaceAll,TemplateReplaceCheckbox";
    194194        lConfigKeys = lConfigKeys & ",ToolbarLocation,ToolbarSets,EnterMode,ShiftEnterMode,Keystrokes";
    195195        lConfigKeys = lConfigKeys & ",ContextMenu,BrowserContextMenuOnCtrl,FontColors,FontNames,FontSizes";
    196196        lConfigKeys = lConfigKeys & ",FontFormats,StylesXmlPath,TemplatesXmlPath,SpellChecker,IeSpellDownloadUrl";
  • fckeditor.cfm

     
    9797                lConfigKeys = lConfigKeys & ",FillEmptyBlocks,FormatSource,FormatOutput,FormatIndentator";
    9898                lConfigKeys = lConfigKeys & ",StartupFocus,ForcePasteAsPlainText,AutoDetectPasteFromWord,ForceSimpleAmpersand";
    9999                lConfigKeys = lConfigKeys & ",TabSpaces,ShowBorders,SourcePopup,ToolbarStartExpanded,ToolbarCanCollapse";
    100                 lConfigKeys = lConfigKeys & ",IgnoreEmptyParagraphValue,PreserveSessionOnFileBrowser,FloatingPanelsZIndex,TemplateReplaceAll,TemplateReplaceCheckbox";
     100                lConfigKeys = lConfigKeys & ",IgnoreEmptyParagraphValue,FloatingPanelsZIndex,TemplateReplaceAll,TemplateReplaceCheckbox";
    101101                lConfigKeys = lConfigKeys & ",ToolbarLocation,ToolbarSets,EnterMode,ShiftEnterMode,Keystrokes";
    102102                lConfigKeys = lConfigKeys & ",ContextMenu,BrowserContextMenuOnCtrl,FontColors,FontNames,FontSizes";
    103103                lConfigKeys = lConfigKeys & ",FontFormats,StylesXmlPath,TemplatesXmlPath,SpellChecker,IeSpellDownloadUrl";
© 2003 – 2019 CKSource – Frederico Knabben. All rights reserved. | Terms of use | Privacy policy