[svn r17806] FS#2867 - FCKEditor: Forcing Flash objects to work in introduction sections.

skala
Ivan Tcholakov 17 years ago
parent 24644bfbbf
commit 2372a21846
  1. 3
      main/inc/lib/fckeditor/editor/dialog/fck_flash/fck_flash.js
  2. 3
      main/inc/lib/fckeditor/editor/plugins/Flash/fck_flash.js
  3. 17
      main/inc/lib/fckeditor/editor/plugins/customizations/fckplugin.js

@ -222,7 +222,8 @@ function BrowseServer()
function SetUrl( url, width, height )
{
// Added by Ivan Tcholakov.
url = FCK.GetSelectedUrl( url ) ;
//url = FCK.GetSelectedUrl( url ) ;
url = FCK.GetSelectedFlashUrl( url ) ;
GetE('txtUrl').value = url ;

@ -202,7 +202,8 @@ function BrowseServer()
function SetUrl( url )
{
// Added by Ivan Tcholakov.
url = FCK.GetSelectedUrl( url ) ;
//url = FCK.GetSelectedUrl( url ) ;
url = FCK.GetSelectedFlashUrl( url ) ;
document.getElementById( 'txtURL' ).value = url ;

@ -1225,6 +1225,23 @@ var DOCUMENT_RELATIVE_URL = 'document-relative' ;
FCK.REPOSITORY_RELATIVE_URL = REPOSITORY_RELATIVE_URL ;
FCK.DOCUMENT_RELATIVE_URL = DOCUMENT_RELATIVE_URL ;
// Conversion of selected by the file managers Flash URL.
// In introduction sections relative flash URLs do not work.
// This is why we will record semi-absolute URLs there.
FCK.GetSelectedFlashUrl = function ( url )
{
// Detection of introduction section.
if ( FCKConfig.CreateDocumentDir == 'document/' ||
/\.\.\/.*\/document\/$/.test( FCKConfig.CreateDocumentDir ) )
{
return FCK.GetUrl( url, SEMI_ABSOLUTE_URL ) ;
}
else
{
return FCK.GetSelectedUrl( url ) ;
}
}
// Conversion of selected by the file managers URLs.
FCK.GetSelectedUrl = function ( url )
{

Loading…
Cancel
Save