Browse Source

[svn r17671] FS#2867 - FCKEditor, debugging for IE7: Fixing some javascript error. Flash dialog: making the flash previw to work.

Ivan Tcholakov 16 years ago
parent
commit
f5f5613a0b

+ 2 - 1
main/inc/lib/fckeditor/editor/plugins/Flash/fck_flash.html

@@ -30,7 +30,8 @@
 		<script type="text/javascript">
 		<!--
 		//document.writeln(FCK.TempBaseTag);
-		document.writeln(FCKConfig.BaseHref);
+		if ( window.parent.FCKConfig.BaseHref.length > 0 )
+			document.write( '<base href="' + window.parent.FCKConfig.BaseHref + '">' ) ;
 		-->
 		</script>
 	</head>

+ 2 - 1
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 ) ;
 		

+ 15 - 0
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 )