[svn r22154] FS#2867 - The online editor: Cleaning an obsolete fix for the simple file manager.

skala
Ivan Tcholakov 17 years ago
parent 8d5002069e
commit 1f249132f0
  1. 8
      main/inc/lib/fckeditor/editor/filemanager/browser/default/frmresourceslist.html
  2. 6
      main/inc/lib/fckeditor/editor/plugins/customizations/fckplugin.js

@ -101,15 +101,7 @@ function OpenFile( fileUrl )
else if ( window.parent.parent && typeof (window.parent.parent.ParentDialog) == 'function' )
{
// The file manager is inside a dialog.
// See http://dev.fckeditor.net/ticket/3925
// Accessing the function SetUrl() : A proposed way by Ivan Tcholakov, 10-JUL-2009.
//window.parent.parent.Args().ParentWindow.SetUrl( encodeURI( fileUrl ).replace( /#/g, '%23' ) ) ;
// Accessing the function SetUrl() : A proposed way by martinkou (the FCKEditor team), 14-JUL-2009.
window.parent.parent.ParentDialog().contentWindow.frames['frmMain'].SetUrl( encodeURI( fileUrl ).replace( /#/g, '%23' ) ) ;
window.parent.parent.CloseDialog() ;
}
return true ;

@ -256,9 +256,6 @@ var FCKDialog = ( function()
Editor : window,
CustomValue : customValue, // Optional
TopWindow : topWindow,
// This is a fix, Ivan Tcholakov, July 2009, see ticket #3925
ParentWindow : parentWindow
//
}
FCK.ToolbarSet.CurrentInstance.Selection.Save( true ) ;
@ -320,9 +317,6 @@ var FCKDialog = ( function()
Editor: window,
CustomValue: customValue,
TopWindow : topWindow,
// This is a fix, Ivan Tcholakov, July 2009, see ticket #3925
ParentWindow : parentWindow
//
} ;
//FCK.ToolbarSet.CurrentInstance.Selection.Save();

Loading…
Cancel
Save