[svn r22372] FS#2867 - The online editor, the Image manager & Image editor, in-dialog mode reworks: Fixing a javascript error (IE8). Establishing access to the translations for the Image editor. Resizing.

main/inc/lib/fckeditor/editor/plugins/ImageManager/assets/EditorContent.js

@@ -362,7 +362,7 @@ function drags(e)
     var firedobj=ns6? e.target : event.srcElement
     var topelement=ns6? "HTML" : "BODY"
 
-    while (firedobj.tagName!=topelement&&
+    while (firedobj.tagName && firedobj.tagName != topelement &&
             !(firedobj.className=="crop" 
                 || firedobj.className=="handleBox" 
                 || firedobj.className=="selection" || firedobj.className=="selectionWhite"))

main/inc/lib/fckeditor/editor/plugins/ImageManager/assets/editor.js

@@ -1,7 +1,7 @@
 /**
  * Functions for the ImageEditor interface, used by editor.php only	
  * @author $Author: Wei Zhuo $
- * @author $Author: Frédéric Klee <fklee@isuisse.com> $ - constraints toggle and check
+ * @author $Author: Frédéric Klee <fklee@isuisse.com> $ - constraints toggle and check
  * @author $Author: Paul Moers <mail@saulmade.nl> $ - watermarking and replace code + several small enhancements <http://www.saulmade.nl/FCKeditor/FCKPlugins.php>
  * @version $Id: editor.js 2006-04-09 $
  * @package ImageManager
@@ -65,7 +65,7 @@
 			}
 
 			//constraints on the scale,
-			//code by Frédéric Klee <fklee@isuisse.com>
+			//code by Frédéric Klee <fklee@isuisse.com>
 			if(action == 'scale') 
 			{
 				var theImage = editor.window.document.getElementById('theImage');
@@ -313,9 +313,10 @@
 	init = function()
 	{
 		var bottom = document.getElementById('bottom');
-		if(window.opener)
-		{
 		__dlg_init(bottom);
+
+		if(I18N)
+		{
 			__dlg_translate(I18N);
 		}
 	}

main/inc/lib/fckeditor/editor/plugins/ImageManager/assets/manager.js

@@ -42,8 +42,10 @@
 	{
 		__dlg_init();
 
-		if(I18N)
+		if( I18N)
+		{
 			__dlg_translate(I18N);
+		}
 
 		var uploadForm = document.getElementById('uploadForm');
 		if(uploadForm) uploadForm.target = 'imgManager';

main/inc/lib/fckeditor/editor/plugins/ImageManager/editor.php

@@ -34,13 +34,14 @@ if (isset($_GET['img'])) {
 	if ( !window.opener && window.parent )
 	{
 		// The image editor is inside a dialog.
+		window.parent.SetAutoSize( true ) ;
 		oEditor = window.parent.InnerDialogLoaded() ;
 	}
 
 	var _editor_lang = 'en' ;
 	if(window.opener)
 	{
-		window.resizeTo(673, 531);
+		window.resizeTo(702, 600);
 
 		if (window.opener.I18N)
 		{
@@ -57,6 +58,14 @@ if (isset($_GET['img'])) {
 			_editor_lang = window.opener._editor_lang ;
 		}
 	}
+	else if ( window.parent )
+	{
+		_editor_lang = oEditor._editor_lang ;
+		if ( oEditor.ImageManager && oEditor.ImageManager.I18N )
+		{
+			I18N = oEditor.ImageManager.I18N ;
+		}
+	}
 
 	// language object not found?
 	if (!this.I18N)

main/inc/lib/fckeditor/editor/plugins/ImageManager/fckplugin.js

@@ -167,7 +167,7 @@ ImageManager.prototype.insert = function(outparam)
 			imgFileName = sElm.src.substring(lastSlashPosition);
 			var url = FCKConfig.PluginsPath + 'ImageManager/editor.php?img=' + "/" + imgFileName;
 			//Dialog(url, null, outparam);
-			OpenDialog( url, null, outparam, 'FCKDialog_ImageEditor', 'Edit Image', 750, 600 );
+			OpenDialog( url, null, outparam, 'FCKDialog_ImageEditor', 'Edit Image', 713, 596 );
 		}
 		// no image selected - stop
 		else

main/inc/lib/fckeditor/editor/plugins/ImageManager/images.php

@@ -199,7 +199,7 @@ function drawErrorBase(&$manager)
 		}
 		else if ( window.parent.oEditor )
 		{
-			window.parent.oEditor.OpenDialog( url, null, null, 'FCKDialog_ImageEditor', 'Edit Image', 750, 600 );
+			window.parent.oEditor.OpenDialog( url, null, null, 'FCKDialog_ImageEditor', 'Edit Image', 713, 596 );
 		}
 	}
 

main/inc/lib/fckeditor/editor/plugins/ImageManager/manager.php

@@ -44,6 +44,7 @@
 	if ( !window.opener && window.parent )
 	{
 		// The image manager is inside a dialog.
+		window.parent.SetAutoSize( true ) ;
 		oEditor = window.parent.InnerDialogLoaded() ;
 	}
 
@@ -64,8 +65,6 @@
 	}
 	else if ( window.parent )
 	{
-		window.parent.SetAutoSize( true ) ;
-
 		_editor_lang = oEditor._editor_lang ;
 		if ( oEditor.ImageManager && oEditor.ImageManager.I18N )
 		{
@@ -116,6 +115,20 @@ body {
 /*]]>*/
 </style>
 
+<script type="text/javascript">
+/*<![CDATA[*/
+
+	function Init()
+	{
+		if (window.opener)
+		{
+			document.getElementById('dialog_title').style.visibility = '' ;
+		}
+	}
+
+/*]]>*/
+</script>
+
 </head>
 
 <body onload='javascript: Init();'>