From f5f5613a0b921e9d1a501e86d169424acddce867 Mon Sep 17 00:00:00 2001 From: Ivan Tcholakov Date: Tue, 13 Jan 2009 10:08:56 +0100 Subject: [PATCH] [svn r17671] FS#2867 - FCKEditor, debugging for IE7: Fixing some javascript error. Flash dialog: making the flash previw to work. --- .../fckeditor/editor/plugins/Flash/fck_flash.html | 3 ++- .../fckeditor/editor/plugins/Flash/fck_flash.js | 3 ++- .../editor/plugins/customizations/fckplugin.js | 15 +++++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/main/inc/lib/fckeditor/editor/plugins/Flash/fck_flash.html b/main/inc/lib/fckeditor/editor/plugins/Flash/fck_flash.html index 966c11efd4..b83f934c8f 100644 --- a/main/inc/lib/fckeditor/editor/plugins/Flash/fck_flash.html +++ b/main/inc/lib/fckeditor/editor/plugins/Flash/fck_flash.html @@ -30,7 +30,8 @@ diff --git a/main/inc/lib/fckeditor/editor/plugins/Flash/fck_flash.js b/main/inc/lib/fckeditor/editor/plugins/Flash/fck_flash.js index 565317f4e1..8538f479fb 100644 --- a/main/inc/lib/fckeditor/editor/plugins/Flash/fck_flash.js +++ b/main/inc/lib/fckeditor/editor/plugins/Flash/fck_flash.js @@ -145,7 +145,8 @@ function updatePreview() GetE( 'txtURL' ).value = sUrl ; } */ - oMedia.url = oEditor.FCKConfig.CreateDocumentWebDir + GetE( 'txtURL' ).value ; // this variable is call in document/create_document.php + //oMedia.url = oEditor.FCKConfig.CreateDocumentWebDir + GetE( 'txtURL' ).value ; // this variable is call in document/create_document.php + oMedia.url = FCK.AddAbsolutePath( GetE( 'txtURL' ).value ) ; updateMovie( oMedia ) ; diff --git a/main/inc/lib/fckeditor/editor/plugins/customizations/fckplugin.js b/main/inc/lib/fckeditor/editor/plugins/customizations/fckplugin.js index 763d60e2bc..bdadd5ffa5 100644 --- a/main/inc/lib/fckeditor/editor/plugins/customizations/fckplugin.js +++ b/main/inc/lib/fckeditor/editor/plugins/customizations/fckplugin.js @@ -1005,6 +1005,11 @@ FCK.RegisterDoubleClickHandler( // Checking whether a selected object is a real image or not. FCK.IsRealImage = function ( tag ) { + if ( !tag ) + { + return false ; + } + return ( tag.nodeName.IEquals( 'img' ) && !tag.getAttribute( '_fckfakelement' ) && !tag.getAttribute( '_fckflash' ) && @@ -1016,6 +1021,11 @@ FCK.IsRealImage = function ( tag ) // Checking for audio file reference which is to be used by a flash player. FCK.IsAudio = function ( tag ) { + if ( !tag ) + { + return false ; + } + if ( tag.nodeName.IEquals( 'embed' ) ) { if ( !tag.src ) @@ -1048,6 +1058,11 @@ FCK.IsAudio = function ( tag ) // Checking for video file reference within an embedded object. FCK.IsVideo = function ( tag ) { + if ( !tag ) + { + return false ; + } + if ( tag.nodeName.IEquals( 'embed' ) ) { if ( !tag.src )