From 8b4fcfa78cd0dc12ce6e3ab002b2315990d600e8 Mon Sep 17 00:00:00 2001 From: Ivan Tcholakov Date: Tue, 28 Jul 2009 22:31:38 +0200 Subject: [PATCH] [svn r22424] FS#2867 - The online editor: Implementing 2.6.5 SVN patch, ticket #2689 - http://dev.fckeditor.net/ticket/2689 . --- documentation/changelog.html | 2 +- .../filemanager/browser/default/frmresourceslist.html | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/documentation/changelog.html b/documentation/changelog.html index 979040868e..3d4cedf715 100644 --- a/documentation/changelog.html +++ b/documentation/changelog.html @@ -34,7 +34,7 @@
  • The installation sript: The page about system requilements has been updated. Also, at the very beginning, a check has been added whether the mbstring php-extension is installed - see the related forum topic. (FS#306)
  • A new php-based configuration for the online editor has been implemented, see dokeos/main/inc/lib/fckeditor/myconfig.php. Also, toolbar definitions have been split in separate php-files within the directory dokeos/main/inc/lib/fckeditor/toolbars/ . Customization of the editor is more convenient and flexible now. (FS#2867)
  • Online editor: A upgrade from FCKEditor 2.6.4 to FCKEditor 2.6.4.1 has been implemented. (FS#4383)
    • -
  • Online editor: Several known bug-fixes from FCKEditor 2.6.5 SVN have been implemented, tickets #1537, #2156, #2821, #2856, #2915, #3120, #3181, #3429, #3439, #3880. (FS#2867)
    • +
  • Online editor: Several known bug-fixes from FCKEditor 2.6.5 SVN have been implemented, tickets #1537, #2156, #2689, #2821, #2856, #2915, #3120, #3181, #3429, #3439, #3880. (FS#2867)
  • Online editor: The simple file manager, the advanced file manager and the image manager have been integrated by default with the editor's dialog system. Thus, they work faster and in a more secure way. (FS#2867)
  • Online editor: Blocking copy/paste for trainees has been added. The feature is configurable through editing the toolbar definition files within the directory dokeos/main/inc/lib/fckeditor/toolbars/ . (FS#2867)
  • Online editor: Preview tabs have been added to the dialogs for inserting video, flv-video, and YouTube video. (FS#2867)
    • diff --git a/main/inc/lib/fckeditor/editor/filemanager/browser/default/frmresourceslist.html b/main/inc/lib/fckeditor/editor/filemanager/browser/default/frmresourceslist.html index c8977e0cde..233a3a4bd7 100644 --- a/main/inc/lib/fckeditor/editor/filemanager/browser/default/frmresourceslist.html +++ b/main/inc/lib/fckeditor/editor/filemanager/browser/default/frmresourceslist.html @@ -94,14 +94,14 @@ function OpenFile( fileUrl ) if ( window.parent.opener ) { // The file manager has been opened in a new window. - window.parent.opener.SetUrl( encodeURI( fileUrl ).replace( /#/g, '%23' ) ) ; + window.parent.opener.SetUrl( fileUrl ) ; window.parent.close() ; window.parent.opener.focus() ; } else if ( window.parent.parent && typeof (window.parent.parent.ParentDialog) == 'function' ) { // The file manager is inside a dialog. - window.parent.parent.ParentDialog().contentWindow.frames['frmMain'].SetUrl( encodeURI( fileUrl ).replace( /#/g, '%23' ) ) ; + window.parent.parent.ParentDialog().contentWindow.frames['frmMain'].SetUrl( fileUrl ) ; window.parent.parent.CloseDialog() ; } return true ; @@ -163,7 +163,7 @@ function GetFoldersAndFilesCallBack( fckXml ) // Get the optional "url" attribute. If not available, build the url. var oFileUrlAtt = oNodes[j].attributes.getNamedItem('url') ; - var sFileUrl = oFileUrlAtt != null ? oFileUrlAtt.value : sCurrentFolderUrl + sFileName ; + var sFileUrl = oFileUrlAtt != null ? oFileUrlAtt.value : encodeURI( sCurrentFolderUrl + sFileName ).replace( /#/g, '%23' ) ; oHtml.Append( oListManager.GetFileRowHtml( sFileName, sFileUrl, sFileSize ) ) ; }