Explorar el Código

#2867 - The online editor: Removing trailing whitespace from all javascript files.

Ivan Tcholakov hace 15 años
padre
commit
4f269f9588
Se han modificado 100 ficheros con 956 adiciones y 956 borrados
  1. 1 1
      main/inc/lib/fckeditor/editor/_source/commandclasses/fcktextcolorcommand.js
  2. 1 1
      main/inc/lib/fckeditor/editor/_source/internals/fck_gecko.js
  3. 1 1
      main/inc/lib/fckeditor/editor/_source/internals/fck_ie.js
  4. 7 7
      main/inc/lib/fckeditor/editor/_source/internals/fckdomtools.js
  5. 10 10
      main/inc/lib/fckeditor/editor/_source/internals/fckxhtml.js
  6. 4 4
      main/inc/lib/fckeditor/editor/_source/internals/fckxhtml_ie.js
  7. 1 1
      main/inc/lib/fckeditor/editor/dialog/common/fck_dialog_common.js
  8. 1 1
      main/inc/lib/fckeditor/editor/dialog/fck_flash/fck_flash.js
  9. 1 1
      main/inc/lib/fckeditor/editor/dialog/fck_image/fck_image.js
  10. 1 1
      main/inc/lib/fckeditor/editor/dialog/fck_link/fck_link.js
  11. 35 35
      main/inc/lib/fckeditor/editor/plugins/Flash/fck_flash.js
  12. 1 1
      main/inc/lib/fckeditor/editor/plugins/Flash/fckplugin.js
  13. 56 56
      main/inc/lib/fckeditor/editor/plugins/ImageManager/assets/EditorContent.js
  14. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/assets/dialog.js
  15. 33 33
      main/inc/lib/fckeditor/editor/plugins/ImageManager/assets/editor.js
  16. 9 9
      main/inc/lib/fckeditor/editor/plugins/ImageManager/assets/editorFrame.js
  17. 20 20
      main/inc/lib/fckeditor/editor/plugins/ImageManager/assets/images.js
  18. 49 49
      main/inc/lib/fckeditor/editor/plugins/ImageManager/assets/manager.js
  19. 2 2
      main/inc/lib/fckeditor/editor/plugins/ImageManager/assets/popup.js
  20. 6 6
      main/inc/lib/fckeditor/editor/plugins/ImageManager/assets/slider.js
  21. 6 6
      main/inc/lib/fckeditor/editor/plugins/ImageManager/assets/wz_jsgraphics.js
  22. 3 3
      main/inc/lib/fckeditor/editor/plugins/ImageManager/fckplugin.js
  23. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/af.js
  24. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/ar.js
  25. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/bn.js
  26. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/bs.js
  27. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/ca.js
  28. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/cs.js
  29. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/da.js
  30. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/el.js
  31. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/en-au.js
  32. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/en-ca.js
  33. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/en-uk.js
  34. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/eo.js
  35. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/es.js
  36. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/et.js
  37. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/eu.js
  38. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/fa.js
  39. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/fi.js
  40. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/fo.js
  41. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/fr-ca.js
  42. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/fr.js
  43. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/gl.js
  44. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/gu.js
  45. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/he.js
  46. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/hi.js
  47. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/hr.js
  48. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/hu.js
  49. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/is.js
  50. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/it.js
  51. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/ja.js
  52. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/km.js
  53. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/ko.js
  54. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/lt.js
  55. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/lv.js
  56. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/mn.js
  57. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/ms.js
  58. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/nb.js
  59. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/nl.js
  60. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/no.js
  61. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/pl.js
  62. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/pt-br.js
  63. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/pt.js
  64. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/ro.js
  65. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/ru.js
  66. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/sk.js
  67. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/sl.js
  68. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/sr-latn.js
  69. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/sr.js
  70. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/sv.js
  71. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/th.js
  72. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/tr.js
  73. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/uk.js
  74. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/vi.js
  75. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/zh-cn.js
  76. 1 1
      main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/zh.js
  77. 37 37
      main/inc/lib/fckeditor/editor/plugins/MP3/fck_mp3.js
  78. 213 213
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/ajaxfilemanager.js
  79. 0 0
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/ajaxfilemanager_c.js
  80. 48 48
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/ajaxfileupload.js
  81. 169 169
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/ajaximageeditor.js
  82. 0 0
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/ajaximageeditor_c.js
  83. 29 29
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/ajaxtexteditor.js
  84. 0 0
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/ajaxtexteditor_c.js
  85. 2 2
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/edit_area/reg_syntax/css.js
  86. 2 2
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/edit_area/reg_syntax/html.js
  87. 18 18
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/edit_area/reg_syntax/js.js
  88. 2 2
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/edit_area/reg_syntax/php.js
  89. 12 12
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/edit_area/reg_syntax/python.js
  90. 2 2
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/edit_area/reg_syntax/xml.js
  91. 1 1
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/for_form.js
  92. 5 5
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/for_tinymce.js
  93. 12 12
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/form.js
  94. 16 16
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/interface.js
  95. 15 15
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/iresizable.js
  96. 1 1
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/iutil.js
  97. 13 13
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/media.js
  98. 2 2
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/rotate.js
  99. 50 50
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/thickbox.js
  100. 4 4
      main/inc/lib/fckeditor/editor/plugins/asciimath/fck_asciimath.js

+ 1 - 1
main/inc/lib/fckeditor/editor/_source/commandclasses/fcktextcolorcommand.js

@@ -193,7 +193,7 @@ FCKTextColorCommand.prototype._CreatePanelBody = function( targetDocument, targe
 		oDiv.innerHTML = '<table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td nowrap align="center">' + FCKLang.ColorMoreColors + '</td></tr></table>' ;
 
 		FCKTools.AddEventListenerEx( oDiv, 'click', FCKTextColorCommand_MoreOnClick, this ) ;
-	
+
 		// Dirty hack for Opera, Safari and Firefox 3.
 		if ( !FCKBrowserInfo.IsIE )
 			oDiv.style.width = '96%' ;

+ 1 - 1
main/inc/lib/fckeditor/editor/_source/internals/fck_gecko.js

@@ -381,7 +381,7 @@ FCK.InsertHtml = function( html )
 		var currentNode = docFrag.RootNode.firstChild ;
 		while ( currentNode && currentNode.nodeType != 1 )
 			currentNode = currentNode.nextSibling ;
-		
+
 		if ( currentNode && FCKListsLib.BlockElements[ currentNode.nodeName.toLowerCase() ] )
 			range.SplitBlock() ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/_source/internals/fck_ie.js

@@ -175,7 +175,7 @@ FCK.InsertHtml = function( html )
 	var fake = FCK.EditorDocument.getElementById('__fakeFCKRemove__') ;
 	// If the span is the only child of a node (so the inserted HTML is beyond that),
 	// remove also that parent that isn't needed. #1537
-	if (fake.parentNode.childNodes.length == 1) 
+	if (fake.parentNode.childNodes.length == 1)
 		fake = fake.parentNode ;
 	fake.removeNode( true ) ;
 

+ 7 - 7
main/inc/lib/fckeditor/editor/_source/internals/fckdomtools.js

@@ -488,24 +488,24 @@ var FCKDomTools =
 
 		for ( var i = 0 ; i < attributes.length ; i++ )
 		{
-			if ( FCKBrowserInfo.IsIE ) 
+			if ( FCKBrowserInfo.IsIE )
 			{
 				var attributeNodeName = attributes[i].nodeName ;
 
-				if ( attributeNodeName.StartsWith( '_fck' ) ) 
+				if ( attributeNodeName.StartsWith( '_fck' ) )
 				{
 					/**
 					 * There are places in the FCKeditor code where HTML element objects
-					 * get values stored as properties (e.g. _fckxhtmljob).  In Internet 
+					 * get values stored as properties (e.g. _fckxhtmljob).  In Internet
 					 * Explorer, these are interpreted as attempts to set attributes on
-					 * the element.  
+					 * the element.
 					 *
 					 * http://msdn.microsoft.com/en-us/library/ms533026(VS.85).aspx#Accessing_Element_Pr
 					 *
-					 * Counting these as HTML attributes cripples 
+					 * Counting these as HTML attributes cripples
 					 * FCK.Style.RemoveFromRange() once FCK.GetData() has been called.
 					 *
-					 * The above conditional prevents these internal properties being 
+					 * The above conditional prevents these internal properties being
 					 * counted as attributes.
 					 *
 					 * refs #2156 and #2834
@@ -514,7 +514,7 @@ var FCKDomTools =
 					continue ;
 				}
 
-				if ( attributeNodeName == 'class' ) 
+				if ( attributeNodeName == 'class' )
 				{
 					// IE has a strange bug. If calling removeAttribute('className'),
 					// the attributes collection will still contain the "class"

+ 10 - 10
main/inc/lib/fckeditor/editor/_source/internals/fckxhtml.js

@@ -57,17 +57,17 @@ FCKXHtml.GetXHTML = function( node, includeNode, format )
 		this._AppendChildNodes( this.MainNode, node, false ) ;
 
 	/**
-	 * FCKXHtml._AppendNode() marks DOM element objects it has 
-	 * processed by adding a property called _fckxhtmljob, 
-	 * setting it equal to the value of FCKXHtml.CurrentJobNum.  
-	 * On Internet Explorer, if an element object has such a 
-	 * property,  it will show up in the object's attributes 
-	 * NamedNodeMap, and the corresponding Attr object in 
-	 * that collection  will have is specified property set 
-	 * to true.  This trips up code elsewhere that checks to 
-	 * see if an element is free of attributes before proceeding 
+	 * FCKXHtml._AppendNode() marks DOM element objects it has
+	 * processed by adding a property called _fckxhtmljob,
+	 * setting it equal to the value of FCKXHtml.CurrentJobNum.
+	 * On Internet Explorer, if an element object has such a
+	 * property,  it will show up in the object's attributes
+	 * NamedNodeMap, and the corresponding Attr object in
+	 * that collection  will have is specified property set
+	 * to true.  This trips up code elsewhere that checks to
+	 * see if an element is free of attributes before proceeding
 	 * with an edit operation (c.f. FCK.Style.RemoveFromRange())
-	 *	
+	 *
 	 * refs #2156 and #2834
 	 */
 	if ( FCKBrowserInfo.IsIE )

+ 4 - 4
main/inc/lib/fckeditor/editor/_source/internals/fckxhtml_ie.js

@@ -95,7 +95,7 @@ FCKXHtml._AppendAttributes = function( xmlNode, htmlNode, node, nodeName )
 /**
  * Used to clean up HTML that has been processed FCKXHtml._AppendNode().
  *
- * For objects corresponding to HTML elements, Internet Explorer will 
+ * For objects corresponding to HTML elements, Internet Explorer will
  * treat a property as if it were an attribute set on that element.
  *
  * http://msdn.microsoft.com/en-us/library/ms533026(VS.85).aspx#Accessing_Element_Pr
@@ -109,7 +109,7 @@ FCKXHtml._AppendAttributes = function( xmlNode, htmlNode, node, nodeName )
  * refs #2156 and #2834
  */
 
-FCKXHtml._RemoveXHtmlJobProperties = function ( node ) 
+FCKXHtml._RemoveXHtmlJobProperties = function ( node )
 {
 	// Select only nodes of type ELEMENT_NODE
 	if (!node || !node.nodeType || node.nodeType != 1)
@@ -120,10 +120,10 @@ FCKXHtml._RemoveXHtmlJobProperties = function ( node )
 		node.removeAttribute('_fckxhtmljob') ;
 
 	// Recurse upon child nodes.
-	if ( node.hasChildNodes() ) 
+	if ( node.hasChildNodes() )
 	{
 		var childNodes = node.childNodes ;
-		for ( var i = childNodes.length - 1 ; i >= 0 ; i-- ) 
+		for ( var i = childNodes.length - 1 ; i >= 0 ; i-- )
 			FCKXHtml._RemoveXHtmlJobProperties( childNodes.item(i) ) ;
 	}
 }

+ 1 - 1
main/inc/lib/fckeditor/editor/dialog/common/fck_dialog_common.js

@@ -353,7 +353,7 @@ function RenameNode( oNode , newTag )
 	// does any browser currently support it in order to test?
 
 	// Only rename element nodes.
-	if ( oNode.nodeType != 1 ) 
+	if ( oNode.nodeType != 1 )
 		return null ;
 
 	// If it's already correct exit here.

+ 1 - 1
main/inc/lib/fckeditor/editor/dialog/fck_flash/fck_flash.js

@@ -31,7 +31,7 @@ var FCKTools	= oEditor.FCKTools ;
 // Set the language direction.
 window.document.dir = FCKLang.Dir ;
 
-// We have to avoid javascript errors if some language variables have not been defined. 
+// We have to avoid javascript errors if some language variables have not been defined.
 FCKLang['UploadSelectFileFirst'] = FCKLang['UploadSelectFileFirst'] ? FCKLang['UploadSelectFileFirst'] : 'Please, select a file before pressing the upload button.' ;
 FCKLang['FileSuccessfullyUploaded'] = FCKLang['FileSuccessfullyUploaded'] ? FCKLang['FileSuccessfullyUploaded'] : 'Your file has been successfully uploaded.' ;
 FCKLang['FileRenamed'] = FCKLang['FileRenamed'] ? FCKLang['FileRenamed'] : 'A file with the same name is already available. The uploaded file has been renamed to ' ;

+ 1 - 1
main/inc/lib/fckeditor/editor/dialog/fck_image/fck_image.js

@@ -32,7 +32,7 @@ var FCKTools	= oEditor.FCKTools ;
 // Set the language direction.
 window.document.dir = FCKLang.Dir ;
 
-// We have to avoid javascript errors if some language variables have not been defined. 
+// We have to avoid javascript errors if some language variables have not been defined.
 FCKLang['UploadSelectFileFirst'] = FCKLang['UploadSelectFileFirst'] ? FCKLang['UploadSelectFileFirst'] : 'Please, select a file before pressing the upload button.' ;
 FCKLang['FileSuccessfullyUploaded'] = FCKLang['FileSuccessfullyUploaded'] ? FCKLang['FileSuccessfullyUploaded'] : 'Your file has been successfully uploaded.' ;
 FCKLang['FileRenamed'] = FCKLang['FileRenamed'] ? FCKLang['FileRenamed'] : 'A file with the same name is already available. The uploaded file has been renamed to ' ;

+ 1 - 1
main/inc/lib/fckeditor/editor/dialog/fck_link/fck_link.js

@@ -33,7 +33,7 @@ var FCKTools	= oEditor.FCKTools ;
 // Set the language direction.
 window.document.dir = FCKLang.Dir ;
 
-// We have to avoid javascript errors if some language variables have not been defined. 
+// We have to avoid javascript errors if some language variables have not been defined.
 FCKLang['UploadSelectFileFirst'] = FCKLang['UploadSelectFileFirst'] ? FCKLang['UploadSelectFileFirst'] : 'Please, select a file before pressing the upload button.' ;
 FCKLang['FileSuccessfullyUploaded'] = FCKLang['FileSuccessfullyUploaded'] ? FCKLang['FileSuccessfullyUploaded'] : 'Your file has been successfully uploaded.' ;
 FCKLang['FileRenamed'] = FCKLang['FileRenamed'] ? FCKLang['FileRenamed'] : 'A file with the same name is already available. The uploaded file has been renamed to ' ;

+ 35 - 35
main/inc/lib/fckeditor/editor/plugins/Flash/fck_flash.js

@@ -46,7 +46,7 @@ function getSelectedMovie()
 	{
 		oSel = FCK.Selection.GetSelectedElement( 'OBJECT' ) ;
 	}
-	
+
 	// gecko
 	else if ( is_gecko )
 	{
@@ -56,7 +56,7 @@ function getSelectedMovie()
 		{
 			oSel = o.anchorNode ;
 		}
-	}	
+	}
 	// other
 	else
 	{
@@ -102,8 +102,8 @@ function Ok()
 	var e = ( oMedia || new Media() ) ;
 
 	e.url = GetE( 'txtURL' ).value ;
-	
-	updateMovie(e) ;	
+
+	updateMovie(e) ;
 
 	FCK.InsertHtml( e.getInnerHTML() ) ;
 	return true ;
@@ -128,37 +128,37 @@ function updateMovie( e )
 }
 
 function updatePreview()
-{		 
+{
 	if ( GetE( 'txtURL' ).value.length == 0 )
 	{
 		ShowE( 'flashPreview', false ) ;
 	}
 	else
 	{
-		var preview = GetE( 'flashPreview' ) ;  
-		
+		var preview = GetE( 'flashPreview' ) ;
+
 		oMedia.url = GetE( 'txtURL' ).value ;
-		
+
 		updateMovie( oMedia ) ;
-		
+
 		// preview.innerHTML dies on IE.. why?? :S
 		if ( is_ie )
 		{
 			preview.outerHTML = oMedia.getInnerHTML( 'flashPreview' ) ;
 		}
-		
+
 		// preview.outerHTML does nothing on gecko..
 		if ( is_gecko )
 		{
 			oMedia.replaceObject( preview ) ;
 		}
-		
-		ShowE( 'flashPreview', true ) ;	
+
+		ShowE( 'flashPreview', true ) ;
 	}
 }
 
 // Fired when the width or height input texts change
-function OnSizeChanged( dimension, value ) 
+function OnSizeChanged( dimension, value )
 {
 	// Verifies if the aspect ration has to be mantained
 	/*
@@ -169,14 +169,14 @@ function OnSizeChanged( dimension, value )
 			GetE('txtHeight').value = GetE('txtWidth').value = '' ;
 			return ;
 		}
-	
+
 		if ( dimension == 'Width' )
 			GetE('txtHeight').value = Math.round( oMovieOriginal.height * ( value  / oMovieOriginal.width ) ) ;
 		else
 			GetE('txtWidth').value  = Math.round( oMovieOriginal.width  * ( value / oMovieOriginal.height ) ) ;
 	}
 	*/
-	
+
 	updatePreview() ;
 }
 
@@ -185,17 +185,17 @@ function BrowseServer()
 	// Set the browser window feature.
 	var iWidth	= oEditor.FCKConfig.FlashBrowserWindowWidth ;
 	var iHeight	= oEditor.FCKConfig.FlashBrowserWindowHeight ;
-	
+
 	var iLeft = ( screen.width  - iWidth ) / 2 ;
 	var iTop  = ( screen.height - iHeight ) / 2 ;
 
 	var sOptions = "toolbar=no,status=no,resizable=yes,dependent=yes" ;
-	sOptions += ",width=" + iWidth ; 
+	sOptions += ",width=" + iWidth ;
 	sOptions += ",height=" + iHeight ;
 	sOptions += ",left=" + iLeft ;
 	sOptions += ",top=" + iTop ;
-	
-	// Open the browser window.	
+
+	// Open the browser window.
 	var oWindow = window.open( oEditor.FCKConfig.FlashBrowserURL, "FCKBrowseWindow", sOptions ) ;
 }
 
@@ -245,7 +245,7 @@ var Media = function ( o )
 	this.loop = 'true' ;
 	this.play = 'true' ;
 	this.controller = 'true' ;
-	
+
 	if ( o )
 	{
 		this.setObjectElement( o ) ;
@@ -255,7 +255,7 @@ var Media = function ( o )
 /**
  * Toma los datos de un elemento.
  * 	Takes data from an item.
- */ 
+ */
 Media.prototype.setObjectElement = function ( e )
 {
 	if (!e) return ;
@@ -427,7 +427,7 @@ Media.prototype.getOuterHTML = function ( objectId )
 	}
 	else if ( this.id != '' )
 	{
-		s += this.createAttribute( 'id', this.id ) ; 
+		s += this.createAttribute( 'id', this.id ) ;
 	}
 	if ( this.width > 0 )
 	{
@@ -453,7 +453,7 @@ Media.prototype.getOuterHTML = function ( objectId )
 	s += '>' ;
 	s += this.getInnerHTML( objectId ) ;
 	s += '</object>' ;
-  
+
 	return s ;
 } ;
 
@@ -465,7 +465,7 @@ Media.prototype.getOuterHTML = function ( objectId )
 Media.prototype.getInnerHTML = function ( objectId )
 {
 	var s = '' ;
-	
+
 //	s += this.createParam( 'movie', this.url ) ;
 //	s += this.createParam( 'src', this.url ) ;
 //	s += this.createParam( 'quality', this.quality ) ;
@@ -477,25 +477,25 @@ Media.prototype.getInnerHTML = function ( objectId )
 //	s += this.createParam( 'type', this.getMimeType() ) ;
 //	s += this.createParam( 'controller', this.controller ) ;
 /*
-	if ( objectId )		
+	if ( objectId )
 		var my_id = objectId ;
-	else 
-	if ( this.id != '' ) 
-		my_id = this.id ;	
+	else
+	if ( this.id != '' )
+		my_id = this.id ;
 	s += '<object ';
 	if ( my_id > 0 )
 		s += 'id="' + my_id  + '" ' ;
 	if (this.align > 0)
 		s += 'align="'+ this.align +'" ' ;
-		
+
 	if (this.height > 0)
-		s += 'height="'+ this.height +'" ' ;	
-	
+		s += 'height="'+ this.height +'" ' ;
+
 	if (this.width > 0)
-		s += 'width="'+ this.width +'" ' ;		
+		s += 'width="'+ this.width +'" ' ;
 	s += 'codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0" ' ;
 	s += 'classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" > ' ;
-	
+
 	s += '<param value="' + this.url + '" name="movie"> ' ;
 	if (this.quality > 0)
 		s += '<param value="' + this.quality+ '" name="quality"> ' ;
@@ -513,7 +513,7 @@ Media.prototype.getInnerHTML = function ( objectId )
 	s += this.createAttribute( 'bgcolor', this.bgcolor ) ;
 	s += this.createAttribute( 'loop', this.loop ) ;
 	s += this.createAttribute( 'play', this.play ) ;
-  
+
 	if ( objectId )
 	{
 		s += this.createAttribute( 'id', objectId ) ;
@@ -534,7 +534,7 @@ Media.prototype.getInnerHTML = function ( objectId )
 	{
 		s += this.createAttribute( 'align', this.align ) ;
 	}
-	if (this.vspace > 0) 
+	if (this.vspace > 0)
 	{
 		s += this.createAttribute( 'vspace', this.vspace ) ;
 	}

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/Flash/fckplugin.js

@@ -7,6 +7,6 @@ FCKCommands.RegisterCommand( 'Flash', flashDialogCmd ) ;
 var oFlashItem		= new FCKToolbarButton( 'Flash', FCKLang["DlgFlashTitle"]) ;
 oFlashItem.IconPath	= FCKConfig.PluginsPath + 'Flash/button.flash.gif' ;
 
-FCKToolbarItems.RegisterItem( 'Flash', oFlashItem ) ;			
+FCKToolbarItems.RegisterItem( 'Flash', oFlashItem ) ;
 // 'Flash' is the name used in the Toolbar config.
 

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

@@ -3,11 +3,11 @@
 ** Version.......:  1.0
 ** Author........:  Xiang Wei ZHUO <wei@zhuo.org>
 ** Filename......:  EditorContents.js
-** Last changed..:  31 Mar 2004 
+** Last changed..:  31 Mar 2004
 ** Notes.........:  Handles most of the interface routines for the ImageEditor.
 *
 * Added:  29 Mar 2004  - Constrainted resizing/scaling
-**/ 
+**/
 
 
 function MM_findObj(n, d) { //v4.01
@@ -29,7 +29,7 @@ function P7_Snap() { //v2.62 by PVII
     if(document.getElementById) {
      d="document.getElementsByName('"+args[k]+"')[0]";
      if(!eval(d)) {d="document.getElementById('"+args[k]+"')";if(!eval(d)) {d=da;}}
-    }else if(document.all) {d=da;} 
+    }else if(document.all) {d=da;}
     if (document.all || document.getElementById) {
      while (tx==1) {p+=".offsetParent";
       if(eval(d+p)) {x+=parseInt(eval(d+p+".offsetLeft"));y+=parseInt(eval(d+p+".offsetTop"));
@@ -66,9 +66,9 @@ var dragapproved=false
 var z,x,y,status, ant, canvas, content, pic_width, pic_height, image, resizeHandle, oa_w, oa_h, oa_x, oa_y, mx2, my2;
 
 
-function init_resize() 
+function init_resize()
 {
-    if(mode == "scale") 
+    if(mode == "scale")
     {
         P7_Snap('theImage','ant',0,0);
 
@@ -81,7 +81,7 @@ function init_resize()
             pic_width = image.width;
             pic_height = image.height;
         }
-        
+
         if (ant == null)
             ant = MM_findObj("ant");
 
@@ -94,7 +94,7 @@ function init_resize()
     }
 }
 
-initEditor = function () 
+initEditor = function ()
 {
     init_crop();
     init_resize();
@@ -105,20 +105,20 @@ initEditor = function ()
         toggleMarker() ;
 }
 
-function init_crop() 
+function init_crop()
 {
     //if(mode == "crop") {
         P7_Snap('theImage','ant',0,0);
     //}
 }
 
-function setMode(newMode) 
+function setMode(newMode)
 {
     mode = newMode;
     reset();
 }
 
-function reset() 
+function reset()
 {
     if (ant == null)
         ant = MM_findObj("ant");
@@ -134,7 +134,7 @@ function reset()
 
     jg_doc.clear();
     if(mode != 'measure')
-        showStatus();   
+        showStatus();
 
     if(mode == "scale") {
         init_resize();
@@ -143,7 +143,7 @@ function reset()
     P7_Snap('theImage','ant',0,0);
 }
 
-function toggleMarker() 
+function toggleMarker()
 {
     //alert("Toggle");
     if (ant == null)
@@ -153,12 +153,12 @@ function toggleMarker()
         ant.className="selectionWhite";
     else
         ant.className="selection";
-    
+
     if (jg_doc.getColor() == "#000000")
         jg_doc.setColor("#FFFFFF");
     else
         jg_doc.setColor("#000000");
-    
+
     drawBoundHandle
     jg_doc.paint();
 }
@@ -209,13 +209,13 @@ function move(e)
                 ant.style.height = -1*h
             }
         }
-        
+
         showStatus();
         return false
     }
 }
 
-function moveContent(e) 
+function moveContent(e)
 {
     if (dragapproved)
     {
@@ -239,13 +239,13 @@ function moveContent(e)
 }
 
 //Code add for constraints by Frédéric Klee <fklee@isuisse.com>
-function moveHandle(e) 
+function moveHandle(e)
 {
     if (dragapproved)
     {
         var w = ns6? e.clientX - x : event.clientX - x;
         var h = ns6? e.clientY - y : event.clientY - y;
-        
+
 		//var constrained = MM_findObj('constProp', window.top.document);
 		var constrained = MM_findObj('constProp', window.parent.document);
         var orginal_height = document.theImage.height ;
@@ -253,14 +253,14 @@ function moveHandle(e)
         rapp = orginal_width/orginal_height ;
         rapp_inv = orginal_height / orginal_width ;
 
-        switch(resizeHandle) 
+        switch(resizeHandle)
         {
 
             case "s-resize":
-                if (oa_h + h >= 0) 
+                if (oa_h + h >= 0)
 				{
                     ant.style.height = oa_h + h;
-					if(constrained.checked) 
+					if(constrained.checked)
 					{
 						ant.style.width = rapp * (oa_h + h) ;
                         ant.style.left = oa_x - rapp * h/2;
@@ -272,7 +272,7 @@ function moveHandle(e)
                 if(oa_w + w >= 0)
 				{
                     ant.style.width = oa_w + w;
-					if(constrained.checked) 
+					if(constrained.checked)
 					{
                         ant.style.height = rapp_inv * (oa_w + w) ;
                         ant.style.top = oa_y - rapp_inv * w/2;
@@ -285,7 +285,7 @@ function moveHandle(e)
                 {
                     ant.style.top = oa_y + h;
                     ant.style.height = oa_h - h;
-					if(constrained.checked) 
+					if(constrained.checked)
 					{
 						ant.style.width = rapp * (oa_h - h) ;
                         ant.style.left = oa_x + rapp * h/2;
@@ -294,11 +294,11 @@ function moveHandle(e)
                 }
                 break;
             case "w-resize":
-                if(oa_w - w >= 0) 
+                if(oa_w - w >= 0)
 				{
                     ant.style.left = oa_x + w;
                     ant.style.width = oa_w - w;
-					if(constrained.checked) 
+					if(constrained.checked)
 					{
 						ant.style.height = rapp_inv * (oa_w - w) ;
 						ant.style.top = oa_y + rapp_inv * w/2;
@@ -310,7 +310,7 @@ function moveHandle(e)
                     ant.style.left = oa_x + w;
                     ant.style.width = oa_w - w;
                     ant.style.top = oa_y + h;
-                    if(constrained.checked) 
+                    if(constrained.checked)
                         ant.style.height = rapp_inv * (oa_w - w) ;
                     else
                         ant.style.height = oa_h - h;
@@ -320,14 +320,14 @@ function moveHandle(e)
                 if (oa_h - h >= 0 && oa_w + w >= 0){
                     ant.style.top = oa_y + h;
 					ant.style.width = oa_w + w;
-					if(constrained.checked) 
+					if(constrained.checked)
                         ant.style.height = rapp_inv * (oa_w + w) ;
                     else
                         ant.style.height = oa_h - h;
                 }
                 break;
             case "se-resize":
-                if (oa_h + h >= 0 && oa_w + w >= 0) 
+                if (oa_h + h >= 0 && oa_w + w >= 0)
                 {
                     ant.style.width = oa_w + w;
                     if(constrained.checked)
@@ -347,10 +347,10 @@ function moveHandle(e)
                        ant.style.height = oa_h + h;
 				}
         }
-        
+
         showStatus();
         return false;
-        
+
     }
 }
 
@@ -358,20 +358,20 @@ function drags(e)
 {
     if (!ie&&!ns6)
         return
-    
+
     var firedobj=ns6? e.target : event.srcElement
     var topelement=ns6? "HTML" : "BODY"
 
     while (firedobj.tagName && firedobj.tagName != topelement &&
-            !(firedobj.className=="crop" 
-                || firedobj.className=="handleBox" 
+            !(firedobj.className=="crop"
+                || firedobj.className=="handleBox"
                 || firedobj.className=="selection" || firedobj.className=="selectionWhite"))
     {
         firedobj=ns6? firedobj.parentNode : firedobj.parentElement
     }
 
     if(firedobj.className=="handleBox") {
-        
+
         if(content != null) {
             if(content.width != null && content.height != null) {
                 content.width = 0;
@@ -380,7 +380,7 @@ function drags(e)
             //alert(content.width+":"+content.height);
         }
         resizeHandle = firedobj.id;
-        
+
         /*if(status!=null) {
             status.innerHTML  = " obj:"+firedobj.id;
         }*/
@@ -399,10 +399,10 @@ function drags(e)
     }
     else
     if((firedobj.className == "selection" || firedobj.className=="selectionWhite")&& mode == "crop") {
-        
+
         x=ns6? e.clientX: event.clientX
         y=ns6? e.clientY: event.clientY
-        
+
         oa_x = parseInt(ant.style.left);
         oa_y = parseInt(ant.style.top);
 
@@ -471,15 +471,15 @@ function drags(e)
         }
 }
 
-function measure(e) 
+function measure(e)
 {
     if (dragapproved)
     {
         mx2 = ns6? e.clientX : event.clientX;
         my2 = ns6? e.clientY : event.clientY;
-        
+
         jg_doc.clear();
-        jg_doc.setStroke(Stroke.DOTTED); 
+        jg_doc.setStroke(Stroke.DOTTED);
         jg_doc.drawLine(x,y,mx2,my2);
         jg_doc.paint();
         showStatus();
@@ -487,7 +487,7 @@ function measure(e)
     }
 }
 
-function setMarker(nx,ny,nw,nh) 
+function setMarker(nx,ny,nw,nh)
 {
     if (ant == null)
         ant = MM_findObj("ant");
@@ -532,20 +532,20 @@ function setMarker(nx,ny,nw,nh)
         ant.style.height = -1*nh
     }
 
-    
+
 }
 
-function max(x,y) 
+function max(x,y)
 {
     if(y > x)
         return x;
-    else 
+    else
         return y;
 }
 
-function drawBoundHandle() 
+function drawBoundHandle()
 {
-    if(ant == null || ant.style == null) 
+    if(ant == null || ant.style == null)
         return false;
 
     var ah = parseInt(ant.style.height);
@@ -578,7 +578,7 @@ function drawBoundHandle()
     //jg_doc.paint();
 }
 
-function showStatus() 
+function showStatus()
 {
     if(ant == null || ant.style == null) {
         return false;
@@ -618,7 +618,7 @@ function showStatus()
             m_a.value = ma + "";
 
         if(r_ra != null &&!isNaN(ma))
-            r_ra.value = ma;            
+            r_ra.value = ma;
 
         //alert("mx1:"+mx1+" my1"+my1);
         return false;
@@ -633,7 +633,7 @@ function showStatus()
     var cy = ay-pic_y<0?0:ay-pic_y;
     cx = cx>pic_width?pic_width:cx;
     cy = cy>pic_height?pic_height:cy;
-    
+
     var cw = ax-pic_x>0?aw:aw-(pic_x-ax);
     var ch = ay-pic_y>0?ah:ah-(pic_y-ay);
 
@@ -641,7 +641,7 @@ function showStatus()
     cw = ax+aw<pic_x+pic_width?cw:cw-(ax+aw-pic_x-pic_width);
 
     ch = ch<0?0:ch; cw = cw<0?0:cw;
-    
+
     if (ant.style.visibility == "hidden")
     {
         cx = ""; cy = ""; cw=""; ch="";
@@ -650,11 +650,11 @@ function showStatus()
     if(mode == 'crop') {
         if(t_cx != null)
             t_cx.value = cx;
-        if (t_cy != null)   
+        if (t_cy != null)
             t_cy.value = cy;
         if(t_cw != null)
             t_cw.value = cw;
-        if (t_ch != null)   
+        if (t_ch != null)
             t_ch.value = ch;
     }
     else if(mode == 'scale') {
@@ -662,7 +662,7 @@ function showStatus()
         var sw = aw, sh = ah;
 
         if (s_sw.value.indexOf('%')>0 && s_sh.value.indexOf('%')>0)
-        {   
+        {
             sw = cw/pic_width;
             sh = ch/pic_height;
         }
@@ -697,7 +697,7 @@ function dragStopped()
         var ax = parseInt(ant.style.left);
         var ay = parseInt(ant.style.top);
         jg_doc.clear();
-        
+
         if(content != null) {
             if(content.width != null && content.height != null) {
                 content.width = aw-1;
@@ -708,7 +708,7 @@ function dragStopped()
         if(mode == "crop") {
             //alert(pic_y);
             jg_doc.fillRectPattern(pic_x,pic_y,pic_width,ay-pic_y,pattern);
-            
+
             var h1 = ah;
             var y1 = ay;
             if (ah+ay >= pic_height+pic_y)
@@ -736,7 +736,7 @@ function dragStopped()
 
         drawBoundHandle();
         jg_doc.paint();
-    
+
         showStatus();
     return false;
 }

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/assets/dialog.js

@@ -82,7 +82,7 @@ Dialog._geckoOpenModal = function(url, action, init) {
 Dialog._addEvent = function(el, evname, func) {
 	if (Dialog.is_ie) {
 		el.attachEvent("on" + evname, func);
-	} else {		
+	} else {
 		el.addEventListener(evname, func, true);
 	}
 };

+ 33 - 33
main/inc/lib/fckeditor/editor/plugins/ImageManager/assets/editor.js

@@ -1,5 +1,5 @@
 /**
- * Functions for the ImageEditor interface, used by editor.php only	
+ * 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: Paul Moers <mail@saulmade.nl> $ - watermarking and replace code + several small enhancements <http://www.saulmade.nl/FCKeditor/FCKPlugins.php>
@@ -10,7 +10,7 @@
 	var current_action = null;
 	var actions = ['crop', 'scale', 'rotate', 'measure', 'save', 'watermark', 'replace'];
 	var orginal_width = null, orginal_height=null;
-	function toggle(action) 
+	function toggle(action)
 	{
 		if(current_action != action)
 		{
@@ -37,7 +37,7 @@
 			}
 
 			current_action = action;
-			
+
 			var tools = document.getElementById('tools_'+action);
 			tools.style.display = 'block';
 			var icon = document.getElementById('icon_'+action);
@@ -49,7 +49,7 @@
 			editor.setMode(current_action);
 
 			// if watermark action, show watermark
-			if(action == 'watermark') 
+			if(action == 'watermark')
 			{
 				if (editor.window.document.getElementById("imgCanvas"))
 				{
@@ -66,7 +66,7 @@
 
 			//constraints on the scale,
 			//code by Frédéric Klee <fklee@isuisse.com>
-			if(action == 'scale') 
+			if(action == 'scale')
 			{
 				var theImage = editor.window.document.getElementById('theImage');
 				orginal_width = theImage.width ;
@@ -80,10 +80,10 @@
 		}
 	}
 
-	function toggleMarker() 
+	function toggleMarker()
 	{
 		var marker = document.getElementById("markerImg");
-		
+
 		if(marker != null && marker.src != null) {
 			if(marker.src.indexOf("t_black.gif") >= 0)
 				marker.src = "img/t_white.gif";
@@ -95,11 +95,11 @@
 	}
 
 	//Toggle constraints
-	function toggleConstraints() 
+	function toggleConstraints()
 	{
 		var lock = document.getElementById("scaleConstImg");
 		var checkbox = document.getElementById("constProp");
-		
+
 		if(lock != null && lock.src != null) {
 			if(lock.src.indexOf("unlocked2.gif") >= 0)
 			{
@@ -115,32 +115,32 @@
 			}
 		}
 	}
-	
+
 	//check the constraints
-	function checkConstrains(changed) 
+	function checkConstrains(changed)
 	{
 		var constrained = document.getElementById('constProp');
-		if(constrained.checked) 
+		if(constrained.checked)
 		{
 			var w = document.getElementById('sw') ;
 			var width = w.value ;
 			var h = document.getElementById('sh') ;
 			var height = h.value ;
-			
-			if(orginal_width > 0 && orginal_height > 0) 
+
+			if(orginal_width > 0 && orginal_height > 0)
 			{
-				if(changed == 'width' && width > 0) 
+				if(changed == 'width' && width > 0)
 					h.value = parseInt((width/orginal_width)*orginal_height);
-				else if(changed == 'height' && height > 0) 
+				else if(changed == 'height' && height > 0)
 					w.value = parseInt((height/orginal_height)*orginal_width);
 			}
 		}
-		
+
 		updateMarker('scale') ;
 	}
 
 
-	function updateMarker(mode) 
+	function updateMarker(mode)
 	{
 		if (mode == 'crop')
 		{
@@ -158,18 +158,18 @@
 		}
 	}
 
-	
-	function rotatePreset(selection) 
+
+	function rotatePreset(selection)
 	{
 		var value = selection.options[selection.selectedIndex].value;
-		
+
 		if(value.length > 0 && parseInt(value) != 0) {
 			var ra = document.getElementById('ra');
 			ra.value = parseInt(value);
 		}
 	}
 
-	function updateFormat(selection) 
+	function updateFormat(selection)
 	{
 		var selected = selection.options[selection.selectedIndex].value;
 
@@ -180,7 +180,7 @@
 
 	}
 
-	function doUpload() 
+	function doUpload()
 	{
 		// hiding action buttons
 		var buttons = parent.document.getElementById('buttons');
@@ -192,14 +192,14 @@
 		// try to restrict the user from closing the editor window when uploading
 		parent.old = (parent.onbeforeunload) ? parent.onbeforeunload : function () {};
 		parent.onbeforeunload = function () {parent.old(); alert(i18n("Please do not close the window while uploading a new image! If you do, the original image gets deleted!")); return false;};
-		
+
 		var uploadForm = document.getElementById('uploadForm');
 		if(uploadForm)
 			showMessage('Uploading');
 	}
 
 	// show processing message
-	function showMessage(newMessage) 
+	function showMessage(newMessage)
 	{
 		var message = document.getElementById('message');
 		var messages = document.getElementById('messages');
@@ -207,12 +207,12 @@
 			message.removeChild(message.firstChild);
 
 		message.appendChild(document.createTextNode(i18n(newMessage)));
-		
+
 		messages.style.display = "block";
 	}
 
 	// hide message
-	function hideMessage() 
+	function hideMessage()
 	{
 		var messages = document.getElementById('messages');
 		messages.style.display = "none";
@@ -258,7 +258,7 @@
 
 			x = background.x + (background.w - floater.w) * x;
 			y = background.y + (background.h - floater.h) * y;
-			
+
 			floater.moveTo(x, y);
 		}
 	}
@@ -304,11 +304,11 @@
 	};
 
 	function addEvent(obj, evType, fn)
-	{ 
-		if (obj.addEventListener) { obj.addEventListener(evType, fn, true); return true; } 
-		else if (obj.attachEvent) {  var r = obj.attachEvent("on"+evType, fn);  return r;  } 
-		else {  return false; } 
-	} 
+	{
+		if (obj.addEventListener) { obj.addEventListener(evType, fn, true); return true; }
+		else if (obj.attachEvent) {  var r = obj.attachEvent("on"+evType, fn);  return r;  }
+		else {  return false; }
+	}
 
 	init = function()
 	{

+ 9 - 9
main/inc/lib/fckeditor/editor/plugins/ImageManager/assets/editorFrame.js

@@ -50,7 +50,7 @@ function doSubmit(action)
         var url = "editorFrame.php?img="+currentImageFile+"&action=watermark&opacity=" + opacity + '&watermarkFullPath=' + watermarkFullPath + '&watermarkX=' + watermarkX + '&watermarkY=' + watermarkY;
 
         location.href = url;
-    }   
+    }
     else if (action == 'crop')
     {
 		//show message
@@ -59,7 +59,7 @@ function doSubmit(action)
 		var url = "editorFrame.php?img="+currentImageFile+"&action=crop&params="+parseInt(t_cx.value)+','+parseInt(t_cy.value)+','+ parseInt(t_cw.value)+','+parseInt(t_ch.value);
 
         location.href = url;
-    }   
+    }
     else if (action == 'scale')
     {
 		//show message
@@ -76,7 +76,7 @@ function doSubmit(action)
 
         var flip = topDoc.getElementById('flip');
 
-        if(flip.value == 'hoz' || flip.value == 'ver') 
+        if(flip.value == 'hoz' || flip.value == 'ver')
             location.href = "editorFrame.php?img="+currentImageFile+"&action=flip&params="+flip.value;
         else if (isNaN(parseFloat(r_ra.value))==false)
             location.href = "editorFrame.php?img="+currentImageFile+"&action=rotate&params="+parseFloat(r_ra.value);
@@ -91,7 +91,7 @@ function doSubmit(action)
         var s_quality = topDoc.getElementById('sliderfieldsave');
 
         var format = s_format.value.split(",");
-        if(s_file.value.length <= 0) 
+        if(s_file.value.length <= 0)
 		{
             alert(i18n('Please enter a filename to save.'));
         }
@@ -108,11 +108,11 @@ function doSubmit(action)
 
 
 function addEvent(obj, evType, fn)
-{ 
-	if (obj.addEventListener) { obj.addEventListener(evType, fn, true); return true; } 
-	else if (obj.attachEvent) {  var r = obj.attachEvent("on"+evType, fn);  return r;  } 
-	else {  return false; } 
-} 
+{
+	if (obj.addEventListener) { obj.addEventListener(evType, fn, true); return true; }
+	else if (obj.attachEvent) {  var r = obj.attachEvent("on"+evType, fn);  return r;  }
+	else {  return false; }
+}
 
 var jg_doc;
 

+ 20 - 20
main/inc/lib/fckeditor/editor/plugins/ImageManager/assets/images.js

@@ -1,5 +1,5 @@
 /**
- * Functions for the image listing, used by images.php only	
+ * Functions for the image listing, used by images.php only
  * @author $Author: Wei Zhuo $
  * @version $Id: images.js 26 2004-03-31 02:35:21Z Wei Zhuo $
  * @package ImageManager
@@ -12,14 +12,14 @@
 			return str;
 	};
 
-	function changeDir(newDir) 
+	function changeDir(newDir)
 	{
 		showMessage('Loading');
 		location.href = "images.php?dir="+newDir;
 	}
 
 
-	function newFolder(dir, newDir) 
+	function newFolder(dir, newDir)
 	{
 		if ( !window.parent.opener && window.parent.oEditor )
 		{
@@ -47,26 +47,26 @@
 					showMessage('Loading');
 					break;
 				}
-			}		
+			}
 		}
 	}
 
-	function selectImage(filename, alt, width, height) 
+	function selectImage(filename, alt, width, height)
 	{
 		//var topDoc = window.top.document;
 		var topDoc = window.parent.document;
-		
+
 		var obj = topDoc.getElementById('f_file');  obj.value = filename;
-		var obj = topDoc.getElementById('f_url');  obj.value = filename;		
+		var obj = topDoc.getElementById('f_url');  obj.value = filename;
 		var obj = topDoc.getElementById('f_width');  obj.value = width;
 		var obj = topDoc.getElementById('f_width'); obj.value = width;
 		var obj = topDoc.getElementById('f_height'); obj.value = height;
 		var obj = topDoc.getElementById('f_alt'); obj.value = alt;
 		var obj = topDoc.getElementById('orginal_width'); obj.value = width;
-		var obj = topDoc.getElementById('orginal_height'); obj.value = height;		
+		var obj = topDoc.getElementById('orginal_height'); obj.value = height;
 	}
 
-	function showMessage(newMessage) 
+	function showMessage(newMessage)
 	{
 		//var topDoc = window.top.document;
 		var topDoc = window.parent.document;
@@ -79,27 +79,27 @@
 				message.removeChild(message.firstChild);
 
 			message.appendChild(topDoc.createTextNode(i18n(newMessage)));
-			
+
 			messages.style.display = "block";
 		}
 	}
 
 	function addEvent(obj, evType, fn)
-	{ 
-		if (obj.addEventListener) { obj.addEventListener(evType, fn, true); return true; } 
-		else if (obj.attachEvent) {  var r = obj.attachEvent("on"+evType, fn);  return r;  } 
-		else {  return false; } 
-	} 
+	{
+		if (obj.addEventListener) { obj.addEventListener(evType, fn, true); return true; }
+		else if (obj.attachEvent) {  var r = obj.attachEvent("on"+evType, fn);  return r;  }
+		else {  return false; }
+	}
 
-	function confirmDeleteFile(file) 
+	function confirmDeleteFile(file)
 	{
 		if(confirm(i18n("Delete file?")))
 			return true;
-	
-		return false;		
+
+		return false;
 	}
 
-	function confirmDeleteDir(dir, count) 
+	function confirmDeleteDir(dir, count)
 	{
 		if(count > 0)
 		{
@@ -107,7 +107,7 @@
 			return;
 		}
 
-		if(confirm(i18n("Delete folder?"))) 
+		if(confirm(i18n("Delete folder?")))
 			return true;
 
 		return false;

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

@@ -1,5 +1,5 @@
 /**
- * Functions for the ImageManager, used by manager.php only	
+ * Functions for the ImageManager, used by manager.php only
  * @author $Author: Wei Zhuo $
  * @version $Id: manager.js 26 2004-03-31 02:35:21Z Wei Zhuo $
  * @package ImageManager
@@ -13,7 +13,7 @@
 	{
 		var FCK = oEditor.FCK ;
 	}
-	
+
 	//Translation
 	function i18n(str) {
 		if(I18N)
@@ -24,7 +24,7 @@
 
 
 	//set the alignment options
-	function setAlign(align) 
+	function setAlign(align)
 	{
 		var selection = document.getElementById('f_align');
 		for(var i = 0; i < selection.length; i++)
@@ -38,7 +38,7 @@
 	}
 
 	//initialise the form
-	init = function () 
+	init = function ()
 	{
 		__dlg_init();
 
@@ -51,7 +51,7 @@
 		if(uploadForm) uploadForm.target = 'imgManager';
 
 		var param = window.dialogArguments;
-		if (param) 
+		if (param)
 		{
 			// strip the extra url details off the passed url. make sure the url still starts with a /
 			param["f_url"] = stripBaseURL(param["f_url"]);
@@ -59,7 +59,7 @@
 
 			document.getElementById("f_url").value = param["f_url"];
 			document.getElementById("f_url_alt").value = param["f_url_alt"];
-			
+
 			document.getElementById("f_alt").value = param["f_alt"];
 			document.getElementById("f_border").value = param["f_border"];
 			document.getElementById("f_vert").value = param["f_vert"];
@@ -83,42 +83,42 @@
         // strip off the base url if it exists
         string = string.replace(base_url, '');
 		return string;
-    
+
 	};
 
 
-	function onCancel() 
+	function onCancel()
 	{
 		__dlg_close(null);
 		return false;
 	};
 
-	function onOK() 
+	function onOK()
 	{
 		// pass data back to the calling window
 		var fields = ["f_url", "f_alt", "f_align", "f_border", "f_horiz", "f_vert", "f_height", "f_width","f_file"];
 		var param = new Object();
 
-		for (var i in fields) 
+		for (var i in fields)
 		{
 			var id = fields[i];
 			var el = document.getElementById(id);
-			
+
 			// A modification by Ivan Tcholakov
 			/*
 			if(id == "f_url" && el.value.indexOf('://') < 0 )
 			{
-				param[id] = makeURL(base_url_alt,el.value);				
+				param[id] = makeURL(base_url_alt,el.value);
 				var str = el.value;
-				var str2 = str;		
-				var len = str.length;			
+				var str2 = str;
+				var len = str.length;
 				if(str.substring(0,1) == '/')
-				{					
+				{
 					str2 = str2.substring(1,len);
-				}						
-				param['f_url_alt']=base_url+str2;				
+				}
+				param['f_url_alt']=base_url+str2;
 			}
-			else 
+			else
 			{
 				param[id] = el.value;
 			}
@@ -140,7 +140,7 @@
 				param["f_url"] = FCK.GetSelectedUrl(str);
 				param['f_url_alt'] = FCK.GetSelectedUrl( str ); // Accepting the URL with conversion to a relative one if it is applicable.
 			}
-			else 
+			else
 			{
 				param[id] = el.value;
 			}
@@ -177,32 +177,32 @@
 	}
 
 	//similar to the Files::makeFile() in Files.php
-	function makeURL(pathA, pathB) 
+	function makeURL(pathA, pathB)
 	{
 		if(pathA.substring(pathA.length-1) != '/')
 			pathA += '/';
 
-		if(pathB.charAt(0) == '/');	
+		if(pathB.charAt(0) == '/');
 			pathB = pathB.substring(1);
 
 		return pathA+pathB;
 	}
 
 
-	function updateDir(selection) 
+	function updateDir(selection)
 	{
 		var newDir = selection.options[selection.selectedIndex].value;
 		changeDir(newDir);
 	}
 
-	function goUpDir() 
+	function goUpDir()
 	{
 		var selection = document.getElementById('dirPath');
 		var currentDir = selection.options[selection.selectedIndex].text;
 		if(currentDir.length < 2)
 			return false;
 		var dirs = currentDir.split('/');
-		
+
 		var search = '';
 
 		for(var i = 0; i < dirs.length - 2; i++)
@@ -223,34 +223,34 @@
 		}
 	}
 
-	function changeDir(newDir) 
+	function changeDir(newDir)
 	{
 		if(typeof imgManager != 'undefined')
 			imgManager.changeDir(newDir);
 	}
 
-	function toggleConstrains(constrains) 
+	function toggleConstrains(constrains)
 	{
 		var lockImage = document.getElementById('imgLock');
 		var constrains = document.getElementById('constrain_prop');
 
-		if(constrains.checked) 
+		if(constrains.checked)
 		{
-			lockImage.src = "img/locked.gif";	
-			checkConstrains('width') 
+			lockImage.src = "img/locked.gif";
+			checkConstrains('width')
 		}
 		else
 		{
-			lockImage.src = "img/unlocked.gif";	
+			lockImage.src = "img/unlocked.gif";
 		}
 	}
 
-	function checkConstrains(changed) 
+	function checkConstrains(changed)
 	{
 		//alert(document.form1.constrain_prop);
 		var constrains = document.getElementById('constrain_prop');
-		
-		if(constrains.checked) 
+
+		if(constrains.checked)
 		{
 			var obj = document.getElementById('orginal_width');
 			var orginal_width = parseInt(obj.value);
@@ -259,11 +259,11 @@
 
 			var widthObj = document.getElementById('f_width');
 			var heightObj = document.getElementById('f_height');
-			
+
 			var width = parseInt(widthObj.value);
 			var height = parseInt(heightObj.value);
 
-			if(orginal_width > 0 && orginal_height > 0) 
+			if(orginal_width > 0 && orginal_height > 0)
 			{
 				if(changed == 'width' && width > 0) {
 					heightObj.value = parseInt((width/orginal_width)*orginal_height);
@@ -272,11 +272,11 @@
 				if(changed == 'height' && height > 0) {
 					widthObj.value = parseInt((height/orginal_height)*orginal_width);
 				}
-			}			
+			}
 		}
 	}
 
-	function showMessage(newMessage) 
+	function showMessage(newMessage)
 	{
 		var message = document.getElementById('message');
 		var messages = document.getElementById('messages');
@@ -284,20 +284,20 @@
 			message.removeChild(message.firstChild);
 
 		message.appendChild(document.createTextNode(i18n(newMessage)));
-		
+
 		messages.style.display = "block";
 	}
 
 	function addEvent(obj, evType, fn)
-	{ 
-		if (obj.addEventListener) { obj.addEventListener(evType, fn, true); return true; } 
-		else if (obj.attachEvent) {  var r = obj.attachEvent("on"+evType, fn);  return r;  } 
-		else {  return false; } 
-	} 
+	{
+		if (obj.addEventListener) { obj.addEventListener(evType, fn, true); return true; }
+		else if (obj.attachEvent) {  var r = obj.attachEvent("on"+evType, fn);  return r;  }
+		else {  return false; }
+	}
 
-	function doUpload() 
+	function doUpload()
 	{
-		
+
 		var uploadForm = document.getElementById('uploadForm');
 		if(uploadForm)
 			showMessage('Uploading');
@@ -310,7 +310,7 @@
 	}
 
 
-	function newFolder() 
+	function newFolder()
 	{
 		var selection = document.getElementById('dirPath');
 		var dir = selection.options[selection.selectedIndex].value;
@@ -338,7 +338,7 @@
 			}
 		}
 
-		Dialog("newFolder.html", function(param) 
+		Dialog("newFolder.html", function(param)
 		{
 			if (!param) // user must have pressed Cancel
 				return false;
@@ -351,8 +351,8 @@
 					return false;
 				}
 
-				if (folder && folder != '' && typeof imgManager != 'undefined') 
-					imgManager.newFolder(dir, encodeURI(folder)); 
+				if (folder && folder != '' && typeof imgManager != 'undefined')
+					imgManager.newFolder(dir, encodeURI(folder));
 			}
 		}, null);
 	}

+ 2 - 2
main/inc/lib/fckeditor/editor/plugins/ImageManager/assets/popup.js

@@ -71,7 +71,7 @@ function __dlg_init(bottom) {
 			// center on parent
 			var x = opener.screenX + (opener.outerWidth - window.outerWidth) / 2;
 			var y = opener.screenY + (opener.outerHeight - window.outerHeight) / 2;
-		
+
 			// Avoiding being in the center of the page.
 			/*
 			window.moveTo(x, y);
@@ -112,7 +112,7 @@ function __dlg_translate(i18n) {
 		var spans = document.getElementsByTagName(types[type]);
 		for (var i = spans.length; --i >= 0;) {
 			var span = spans[i];
-			if (span.firstChild && span.firstChild.data) {				
+			if (span.firstChild && span.firstChild.data) {
 				var txt = i18n[span.firstChild.data];
 				if (txt) span.firstChild.data = txt;
 			}

+ 6 - 6
main/inc/lib/fckeditor/editor/plugins/ImageManager/assets/slider.js

@@ -3,9 +3,9 @@
 ** Version.......:  1.1
 ** Author........:  Xiang Wei ZHUO <wei@zhuo.org>
 ** Filename......:  slider.js
-** Last changed..:  31 Mar 2004 
+** Last changed..:  31 Mar 2004
 ** Notes.........:  Works in IE and Mozilla
-**/ 
+**/
 
 var ie=document.all
 var ns6=document.getElementById&&!document.all
@@ -19,11 +19,11 @@ function getMouseXY(e) {
 
     x = ns6? e.clientX: event.clientX
     y = ns6? e.clientY: event.clientY
-    
+
     if (sx < 0) sx = x; if (sy < 0) sy = y;
 
     var dx = initX +(x-sx);
-    
+
     if (dx <= rangeMin)
         dx = rangeMin;
     else if (dx >= rangeMax)
@@ -33,7 +33,7 @@ function getMouseXY(e) {
 
     if (currentSlider !=  null)
         currentSlider.style.left = dx+"px";
-        
+
     if (sliderField != null)
     {
         sliderField.value = parseInt(range);
@@ -75,7 +75,7 @@ function updateSlider(value, action)
 
     if (currentSlider !=  null)
         currentSlider.style.left = newValue+"px";
-    
+
     var range = newValue/(rangeMax - rangeMin)*100;
 
     if (sliderField != null)

+ 6 - 6
main/inc/lib/fckeditor/editor/plugins/ImageManager/assets/wz_jsgraphics.js

@@ -3,9 +3,9 @@
 ** Version.......:  1.0
 ** Author........:  Xiang Wei ZHUO <wei@zhuo.org>
 ** Filename......:  wz_jsgraphics.js
-** Last changed..:  31 Aug 2003  
+** Last changed..:  31 Aug 2003
 ** Notes.........:  Modified for Image Editor, added extra commands
-**/ 
+**/
 
 /* This notice must be untouched at all times.
 
@@ -794,7 +794,7 @@ function jsGraphics(id, wnd)
 
     this.drawHandle = function(x, y, w, h, cursor)
     {
-        
+
         this.htm += '<div style="position:absolute;'+
         'left:' + x + 'px;'+
         'top:' + y + 'px;'+
@@ -808,7 +808,7 @@ function jsGraphics(id, wnd)
 
     this.drawHandleBox = function(x, y, w, h, cursor)
     {
-        
+
         this.htm += '<div style="position:absolute;'+
         'left:' + x + 'px;'+
         'top:' + y + 'px;'+
@@ -819,7 +819,7 @@ function jsGraphics(id, wnd)
         "cursor: '" + cursor + "';"+
         '" class="handleBox" id="' + cursor + '" ><\/div>';
 
-        
+
     }
 
     this.drawPolygon = function(x, y)
@@ -886,7 +886,7 @@ function jsGraphics(id, wnd)
     {
         this.htm = "";
         if (this.cnv) this.cnv.innerHTML = this.defhtm;
-        
+
     };
 
 

+ 3 - 3
main/inc/lib/fckeditor/editor/plugins/ImageManager/fckplugin.js

@@ -61,7 +61,7 @@
 	}
 
 	FCKCommands.RegisterCommand('ImageManager', new FCKImageManager('ImageManager')) ;
-	 
+
 	// Create the toolbar button.
 	var oImageManagerItem = new FCKToolbarButton( 'ImageManager', "ImageManager", null, null, false, true ) ;
 
@@ -98,8 +98,8 @@
 		} if(FCKSelection.GetType() == 'Text') {
 			var sElm = FCKSelection.GetParentElement();
 		}
-		
-		if (sElm != null && sElm.nodeName.toLowerCase() == 'img') 
+
+		if (sElm != null && sElm.nodeName.toLowerCase() == 'img')
 			var im = sElm;  // is current cell a image ?
 
 		if (im)

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/af.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/ar.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/bn.js

@@ -121,6 +121,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/bs.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/ca.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/cs.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/da.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/el.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/en-au.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/en-ca.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/en-uk.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/eo.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/es.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/et.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/eu.js

@@ -123,6 +123,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/fa.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/fi.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/fo.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/fr-ca.js

@@ -119,5 +119,5 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 };

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/fr.js

@@ -119,5 +119,5 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 };

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/gl.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/gu.js

@@ -120,6 +120,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/he.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/hi.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/hr.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/hu.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/is.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/it.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/ja.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/km.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/ko.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/lt.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/lv.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/mn.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/ms.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/nb.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/nl.js

@@ -118,5 +118,5 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 };

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/no.js

@@ -121,6 +121,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/pl.js

@@ -118,5 +118,5 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 };

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/pt-br.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/pt.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/ro.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/ru.js

@@ -118,5 +118,5 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 };

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/sk.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/sl.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/sr-latn.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/sr.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/sv.js

@@ -121,6 +121,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/th.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/tr.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/uk.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/vi.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/zh-cn.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ImageManager/lang/zh.js

@@ -122,6 +122,6 @@ ImageManager.I18N = {
 
 	"OK"                          : "OK",
 	"Cancel"                      : "Cancel"
- 
+
 } ;
 

+ 37 - 37
main/inc/lib/fckeditor/editor/plugins/MP3/fck_mp3.js

@@ -9,7 +9,7 @@ var mp3_url="";
 // Set the language direction.
 window.document.dir = oEditor.FCKLang.Dir ;
 
-// We have to avoid javascript errors if some language variables have not been defined. 
+// We have to avoid javascript errors if some language variables have not been defined.
 FCKLang['UploadSelectFileFirst'] = FCKLang['UploadSelectFileFirst'] ? FCKLang['UploadSelectFileFirst'] : 'Please, select a file before pressing the upload button.' ;
 FCKLang['FileSuccessfullyUploaded'] = FCKLang['FileSuccessfullyUploaded'] ? FCKLang['FileSuccessfullyUploaded'] : 'Your file has been successfully uploaded.' ;
 FCKLang['FileRenamed'] = FCKLang['FileRenamed'] ? FCKLang['FileRenamed'] : 'A file with the same name is already available. The uploaded file has been renamed to ' ;
@@ -25,7 +25,7 @@ window.parent.AddTab( 'Upload', FCKLang.DlgMP3Upload ) ;
 function OnDialogTabChange( tabCode )
 {
 	ShowE('divInfo'		, ( tabCode == 'Info' ) ) ;
-	ShowE('divUpload'	, ( tabCode == 'Upload' ) ) ;	
+	ShowE('divUpload'	, ( tabCode == 'Upload' ) ) ;
 }
 
 var sAgent = navigator.userAgent.toLowerCase() ;
@@ -92,7 +92,7 @@ function getSelectedMovie()
 	if (is_ie) {
 		oSel = FCK.Selection.GetSelectedElement( 'OBJECT' );
 	}
-	
+
 	// gecko
 	else if (is_gecko) {
 		var o = FCK.EditorWindow.getSelection() ;
@@ -126,53 +126,53 @@ function Ok()
 	if ( GetE('mpUrl').value.length == 0 )
 	{
 		window.parent.SetSelectedTab( 'Info' ) ;
-		GetE('mpUrl').focus() ;	
+		GetE('mpUrl').focus() ;
 		alert( 'Please insert the URL.' ) ;
 		return false ;
 	}
 
 	var oFakeImage  = null ;
-		
+
 	oEmbed = FCK.EditorDocument.createElement('embed');
 	UpdateEmbed(oEmbed);
-	
+
 	//oObject = FCK.EditorDocument.createElement('object');
-	//oObject.appendChild(oEmbed);	
-	
+	//oObject.appendChild(oEmbed);
+
 	/*SetAttribute(oObject, 'classid', 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000');
 	SetAttribute(oObject, 'codebase', 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#6,0,0,0');
 	SetAttribute(oObject, 'width', '300');
 	SetAttribute(oObject, 'height', '20');
-	
+
 	oParamBgcolor = FCK.EditorDocument.createElement('param');
 	SetAttribute(oParamBgcolor, 'value', '#FFFFFF');
 	SetAttribute(oParamBgcolor, 'name', 'bgcolor');
 	oObject.appendChild(oParamBgcolor);
-	
+
 	oParamMovie = FCK.EditorDocument.createElement('param');
 	SetAttribute(oParamMovie, 'value', getObjData(GetE('mpUrl').value));
 	SetAttribute(oParamMovie, 'name', 'movie');
 	oObject.appendChild(oParamMovie);
-	
+
 	oParamWAllowfullscreen = FCK.EditorDocument.createElement('param');
 	SetAttribute(oParamWAllowfullscreen, 'value', 'false');
 	SetAttribute(oParamWAllowfullscreen, 'name', 'allowfullscreen');
 	oObject.appendChild(oParamWAllowfullscreen);
-	
+
 	oParamScriptAccess = FCK.EditorDocument.createElement('param');
 	SetAttribute(oParamScriptAccess, 'value', 'always');
 	SetAttribute(oParamScriptAccess, 'name', 'allowscriptaccess');
 	oObject.appendChild(oParamScriptAccess);
-	
+
 	oParamSRC = FCK.EditorDocument.createElement('param');
 	SetAttribute(oParamSRC, 'value', 'file='+getSoundUrl()+'&autostart='+getAutostart());
 	SetAttribute(oParamSRC, 'name', 'flashvars');
 	oObject.appendChild(oParamSRC);*/
-	
+
 	oFakeImage	= oEditor.FCKDocumentProcessor_CreateFakeImage( 'FCK__MP3', oEmbed ) ;
 	oFakeImage.setAttribute( '_fckmp3', 'true', 0 ) ;
 	oFakeImage	= FCK.InsertElement( oFakeImage ) ;
-	
+
 	return true ;
 }
 
@@ -202,7 +202,7 @@ var ePreview ;
 function SetPreviewElement( previewEl )
 {
 	ePreview = previewEl ;
-	
+
 	if ( GetE('mpUrl').value.length > 0 )
 		updatePreview() ;
 }
@@ -222,12 +222,12 @@ function BrowseServer()
 	// Set the browser window feature.
 	var iWidth	= oEditor.FCKConfig.MP3BrowserWindowWidth ;
 	var iHeight	= oEditor.FCKConfig.MP3BrowserWindowHeight ;
-	
+
 	var iLeft = (screen.width  - iWidth) / 2 ;
 	var iTop  = (screen.height - iHeight) / 2 ;
 
 	var sOptions = "toolbar=no,status=no,resizable=yes,dependent=yes" ;
-	sOptions += ",width=" + iWidth ; 
+	sOptions += ",width=" + iWidth ;
 	sOptions += ",height=" + iHeight ;
 	sOptions += ",left=" + iLeft ;
 	sOptions += ",top=" + iTop ;
@@ -238,8 +238,8 @@ function BrowseServer()
 
 function SetUrl( url )
 {
-	document.getElementById('mpUrl').value = url ;	 
-	//updatePreview(); 
+	document.getElementById('mpUrl').value = url ;
+	//updatePreview();
 	Ok();
 	window.parent.Cancel();
 }
@@ -248,27 +248,27 @@ var Media = function (o)
 {
 	this.url = '';
 	this.width = '';
-	this.height = '';	
-	if (o) 
+	this.height = '';
+	if (o)
 		this.setObjectElement(o);
 };
 
 /**
  * Toma los datos de un elemento.
  * Takes data from an item.
- */ 
+ */
 Media.prototype.setObjectElement = function (e)
 {
-	if (!e) return ;	
+	if (!e) return ;
 	this.width = GetAttribute( e, 'width', this.width );
 	this.height = GetAttribute( e, 'height', this.height );
-	this.url = GetAttribute( e, 'data', this.url );	
+	this.url = GetAttribute( e, 'data', this.url );
 	// params
 	for (var i=0;i<e.childNodes.length;i++){
 		if (e.childNodes[i].tagName == 'PARAM'){
 			var paramName = GetAttribute(e.childNodes[i], 'name', '').toLowerCase();
 			var paramValue = GetAttribute(e.childNodes[i], 'value', '');
-			
+
 			switch (paramName)
 			{
 				case 'movie':
@@ -301,7 +301,7 @@ Media.prototype.setObjectElement = function (e)
  */
 Media.prototype.getOuterHTML = function (objectId){
 	var s;
- 	s= this.getInnerHTML(objectId);  
+ 	s= this.getInnerHTML(objectId);
  	return s;
 };
 
@@ -353,10 +353,10 @@ function OnUploadCompleted( errorNumber, fileUrl, fileName, customMsg )
 			window.location.href=FCKConfig.PluginsPath + 'MP3/fck_mp3.php';
 			return ;
 	}
-	
+
 	SetUrl( fileUrl ) ;
 	//SetAutostart(GetE('autostart').value);
-	
+
 	GetE('frmUpload').reset() ;
 	// Reset the interface elements.
 	//document.getElementById('eUploadMessage').innerHTML = 'Upload' ;
@@ -376,7 +376,7 @@ function CheckUpload()
 		alert( FCKLang['UploadSelectFileFirst'] ) ;
 		return false ;
 	}
-	
+
 	if ( ( FCKConfig.MP3UploadAllowedExtensions.length > 0 && !oUploadAllowedExtRegex.test( sFile ) ) ||
 		( FCKConfig.MP3UploadDeniedExtensions.length > 0 && oUploadDeniedExtRegex.test( sFile ) ) )
 	{
@@ -384,17 +384,17 @@ function CheckUpload()
 		return false ;
 	}
 	//document.getElementById('eUploadMessage').innerHTML = 'Upload in progress, please wait...' ;
-	document.getElementById('btnUpload').disabled = true ;	
+	document.getElementById('btnUpload').disabled = true ;
 	return true ;
 }
 
 function getObjData(mpUrl)
 { 		// to create data attribute for object
-		var url=mpUrl; 		
+		var url=mpUrl;
 		//var configBasePath = FCKConfig.BasePath;
-		//var cor_indx=configBasePath.indexOf("inc/")+4;		
-		//configBasePath.substring(0, cor_indx)+"lib/mp3player/player_mp3.swf";					
-		var objdata = rel_path+'inc/lib/mediaplayer/player.swf'; // real_path variable is defined in fck_mp3.php  
+		//var cor_indx=configBasePath.indexOf("inc/")+4;
+		//configBasePath.substring(0, cor_indx)+"lib/mp3player/player_mp3.swf";
+		var objdata = rel_path+'inc/lib/mediaplayer/player.swf'; // real_path variable is defined in fck_mp3.php
 		setSoundUrl(GetE('mpUrl').value);
 		return objdata;
 }
@@ -408,7 +408,7 @@ function setSoundUrl(url)
 }
 
 function getSoundUrl()
-{		
+{
 	return mp3_url;
 }
 
@@ -420,7 +420,7 @@ function getAutostart()
 function getObjUrl(mpUrl2)
 { // to get source url
 		var url2=mpUrl2;
-		var cor_indx2 = url2.indexOf("son=")+4;		
+		var cor_indx2 = url2.indexOf("son=")+4;
 		var objdata2 = url2.substring(cor_indx2, mpUrl2.length);
 		return objdata2;
 }

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 213 - 213
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/ajaxfilemanager.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/ajaxfilemanager_c.js


+ 48 - 48
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/ajaxfileupload.js

@@ -4,7 +4,7 @@ jQuery.extend({
 	{
 			//create frame
             var frameId = 'jUploadFrame' + id;
-            
+
             if(window.ActiveXObject) {
                 var io = document.createElement('<iframe id="' + frameId + '" name="' + frameId + '" />');
                 if(typeof uri== 'boolean'){
@@ -25,14 +25,14 @@ jQuery.extend({
 
             document.body.appendChild(io);
 
-            return io;			
+            return io;
     },
     createUploadForm: function(id, fileElementId)
 	{
-		//create form	
+		//create form
 		var formId = 'jUploadForm' + id;
 		var fileId = 'jUploadFile' + id;
-		var form = jQuery('<form  action="" method="POST" name="' + formId + '" id="' + formId + '" enctype="multipart/form-data"></form>');	
+		var form = jQuery('<form  action="" method="POST" name="' + formId + '" id="' + formId + '" enctype="multipart/form-data"></form>');
 		var oldElement = jQuery('#' + fileElementId);
 		var newElement = jQuery(oldElement).clone();
 		jQuery(oldElement).attr('id', fileId);
@@ -42,54 +42,54 @@ jQuery.extend({
 		jQuery(form).css('position', 'absolute');
 		jQuery(form).css('top', '-1200px');
 		jQuery(form).css('left', '-1200px');
-		jQuery(form).appendTo('body');		
+		jQuery(form).appendTo('body');
 		return form;
     },
 
     ajaxFileUpload: function(s) {
-        // TODO introduce global settings, allowing the client to modify them for all requests, not only timeout		
+        // TODO introduce global settings, allowing the client to modify them for all requests, not only timeout
         s = jQuery.extend({}, jQuery.ajaxSettings, s);
-        var id = s.fileElementId;        
+        var id = s.fileElementId;
 		var form = jQuery.createUploadForm(id, s.fileElementId);
 		var io = jQuery.createUploadIframe(id, s.secureuri);
 		var frameId = 'jUploadFrame' + id;
-		var formId = 'jUploadForm' + id;		
-        
+		var formId = 'jUploadForm' + id;
+
         if( s.global && ! jQuery.active++ )
 		{
 			// Watch for a new set of requests
 			jQuery.event.trigger( "ajaxStart" );
-		}            
+		}
         var requestDone = false;
         // Create the request object
-        var xml = {};   
+        var xml = {};
         if( s.global )
         {
         	jQuery.event.trigger("ajaxSend", [xml, s]);
-        }            
-        
+        }
+
         var uploadCallback = function(isTimeout)
-		{		
-			// Wait for a response to come back	
+		{
+			// Wait for a response to come back
 			var io = document.getElementById(frameId);
-            try 
-			{				
+            try
+			{
 				if(io.contentWindow)
 				{
 					 xml.responseText = io.contentWindow.document.body?io.contentWindow.document.body.innerHTML:null;
                 	 xml.responseXML = io.contentWindow.document.XMLDocument?io.contentWindow.document.XMLDocument:io.contentWindow.document;
-					 
+
 				}else if(io.contentDocument)
 				{
 					 xml.responseText = io.contentDocument.document.body?io.contentDocument.document.body.innerHTML:null;
                 	xml.responseXML = io.contentDocument.document.XMLDocument?io.contentDocument.document.XMLDocument:io.contentDocument.document;
-				}						
+				}
             }catch(e)
 			{
 				jQuery.handleError(s, xml, null, e);
 			}
-            if( xml || isTimeout == "timeout") 
-			{				
+            if( xml || isTimeout == "timeout")
+			{
                 requestDone = true;
                 var status;
                 try {
@@ -98,33 +98,33 @@ jQuery.extend({
                     if( status != "error" )
 					{
                         // process the data (runs the xml through httpData regardless of callback)
-                        var data = jQuery.uploadHttpData( xml, s.dataType );                        
+                        var data = jQuery.uploadHttpData( xml, s.dataType );
                         if( s.success )
                         {
 							// ifa local callback was specified, fire it and pass it the data
                         	s.success( data, status );
-                        };                 
+                        };
                         if( s.global )
                         {
 							// Fire the global callback
                         	jQuery.event.trigger( "ajaxSuccess", [xml, s] );
-                        };                            
+                        };
                     } else
                     {
                     	jQuery.handleError(s, xml, status);
                     }
-                        
-                } catch(e) 
+
+                } catch(e)
 				{
                     status = "error";
                     jQuery.handleError(s, xml, status, e);
-                };                
+                };
                 if( s.global )
                 {
 					// The request was completed
                 	jQuery.event.trigger( "ajaxComplete", [xml, s] );
                 };
-                    
+
 
                 // Handle the global AJAX counter
                 if(s.global && ! --jQuery.active)
@@ -134,20 +134,20 @@ jQuery.extend({
                 if(s.complete)
                 {
                 	 s.complete(xml, status);
-                } ;                 
+                } ;
 
                 jQuery(io).unbind();
 
                 setTimeout(function()
-									{	try 
+									{	try
 										{
 											jQuery(io).remove();
-											jQuery(form).remove();	
-											
-										} catch(e) 
+											jQuery(form).remove();
+
+										} catch(e)
 										{
 											jQuery.handleError(s, xml, null, e);
-										}									
+										}
 
 									}, 100);
 
@@ -156,19 +156,19 @@ jQuery.extend({
             };
         }
         // Timeout checker
-        if( s.timeout > 0 ) 
+        if( s.timeout > 0 )
 		{
             setTimeout(function(){
-                
+
                 if( !requestDone )
                 {
 					// Check to see ifthe request is still happening
                 	uploadCallback( "timeout" );
                 }
-                
+
             }, s.timeout);
         }
-        try 
+        try
 		{
 			var form = jQuery('#' + formId);
 			jQuery(form).attr('action', s.url);
@@ -176,16 +176,16 @@ jQuery.extend({
 			jQuery(form).attr('target', frameId);
             if(form.encoding)
 			{
-                form.encoding = 'multipart/form-data';				
+                form.encoding = 'multipart/form-data';
             }
             else
-			{				
+			{
                 form.enctype = 'multipart/form-data';
-            }			
+            }
             jQuery(form).submit();
 
-        } catch(e) 
-		{			
+        } catch(e)
+		{
             jQuery.handleError(s, xml, null, e);
         }
         if(window.attachEvent){
@@ -193,8 +193,8 @@ jQuery.extend({
         }
         else{
             document.getElementById(frameId).addEventListener('load', uploadCallback, false);
-        } 		
-        return {abort: function () {}};	
+        }
+        return {abort: function () {}};
 
     },
 
@@ -206,19 +206,19 @@ jQuery.extend({
         {
         	jQuery.globalEval( data );
         }
-            
+
         // Get the JavaScript object, ifJSON is used.
         if( type == "json" )
         {
         	eval( "data = " + data );
         }
-            
+
         // evaluate scripts within html
         if( type == "html" )
         {
         	jQuery("<div>").html(data).evalScripts();
         }
-            
+
         return data;
     }
 });

+ 169 - 169
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/ajaximageeditor.js

@@ -19,7 +19,7 @@
 				CheckedElem = document.formAction.mode[i];
 			}
 		}
-		CheckedElem.checked = true;	
+		CheckedElem.checked = true;
 		return CheckedElem.value;
 	};
 	/**
@@ -28,7 +28,7 @@
 	*/
 	function changeMode(restore, force)
 	{
-		
+
 			var mode = getModeValue();
 			var imageMode = $('#image_mode');
 			if(mode != $(imageMode).val() || (typeof(restore) == "boolean"))
@@ -43,7 +43,7 @@
 						if(!restoreToOriginal(restore))
 						{
 							return false;
-							
+
 						}
 						clearImageHistory();
 					}
@@ -53,56 +53,56 @@
 						return false;
 					}else
 					{
-						restoreToOriginal(false);						
+						restoreToOriginal(false);
 						clearImageHistory();
-					}				
+					}
 				}else if((typeof(restore) == "boolean" && restore))
 				{
-					return false;	
+					return false;
 				}
-				initPositionHandler();				
+				initPositionHandler();
 				switch(mode)
 				{
 					case "resize":
 						switch($('#image_mode').val())
 						{
 							case "crop":
-								disableCrop();								
+								disableCrop();
 								break;
 							case "rotate":
 								disableRotate();
 								break;
 							case "flip":
 								disableFlip();
-								break;								
+								break;
 							default:
 								disableRotate();
-						}						
+						}
 						enableResize(document.formAction.constraint.checked);
 						break;
-					case "crop":						
+					case "crop":
 						switch($('#image_mode').val())
 						{
 							case "resize":
-								disableResize();								
+								disableResize();
 								break;
 							case "rotate":
 								disableRotate();
 								break;
 							case "flip":
 								disableFlip();
-								break;								
+								break;
 							default:
 								disableRotate();
-						}	
+						}
 						enableCrop();
-						
+
 						break;
 					case "rotate":
 						switch($('#image_mode').val())
 						{
 							case "resize":
-								disableResize();								
+								disableResize();
 								break;
 							case "crop":
 								disableCrop();
@@ -112,14 +112,14 @@
 								break;
 							default:
 								//do nothing
-						}						
+						}
 						enableRotate();
-						break;	
+						break;
 					case "flip":
 						switch($('#image_mode').val())
 						{
 							case "resize":
-								disableResize();								
+								disableResize();
 								break;
 							case "crop":
 								disableCrop();
@@ -129,19 +129,19 @@
 								break;
 							default:
 								//do nothing
-						}								
+						}
 						enableFlip();
 						break;
 					default:
 						alert('Unexpected Operation!');
-						return false;			
+						return false;
 				}
 				$('#image_mode').val(mode);
 			}
 
 	};
-	
-	
+
+
 	function resetEditor()
 	{
 		if(isImageHistoryExist())
@@ -152,7 +152,7 @@
 			alert(warningResetEmpty);
 		}
 		return false;
-		
+
 	};
 
 	/**
@@ -176,7 +176,7 @@
         $(imageContainer).css('width', imageWidth + 'px');
         $(imageContainer).css('height', imageHeight + 'px');
         $(imageToResize).css('opacity', '.5');
-		
+
         //Init Overlay
         overlay.css('background-image', 'url('+ $(imageToResize).attr('src')+')');
         overlay.css('width', imageWidth + 'px');
@@ -186,7 +186,7 @@
         widthField.val(imageWidth);
         heightField.val(imageHeight);
         topField.val(0);
-        leftField.val(0);		
+        leftField.val(0);
 	    $(overlay).Resizable(
 			{
 				minWidth: 10,
@@ -222,22 +222,22 @@
 					$(topField).val(Math.round(position.top - imageContainerTop));
 					$(leftField).val(Math.round(position.left - imageContainerLeft));
 					addImageHistory();
-					$('#ratio').val($(overlay).ResizableRatio() );	
+					$('#ratio').val($(overlay).ResizableRatio() );
 				}
 			}
 		);
 		enableConstraint();
 		toggleConstraint();
 		disableRotate();
-		
+
 	};
 	/*
-	*	disable crop function 
-	*/	
+	*	disable crop function
+	*/
 	function disableCrop()
 	{
-		$('#resizeMe').ResizableDestroy();		
-		hideHandlers();					
+		$('#resizeMe').ResizableDestroy();
+		hideHandlers();
 	};
 	/**
 	*	disable resize function
@@ -245,22 +245,22 @@
 	function disableResize()
 	{
 		$('#resizeMe').ResizableDestroy();
-		
-		hideHandlers();					
+
+		hideHandlers();
 	};
 	/**
-	*	hide all handlers 
-	*/	
+	*	hide all handlers
+	*/
 	function hideHandlers()
 	{
 		$('#resizeSE').hide();
 		$('#resizeE').hide();
-		$('#resizeNE').hide();	
+		$('#resizeNE').hide();
 		$('#resizeN').hide();
 		$('#resizeNW').hide();
-		$('#resizeW').hide();	
+		$('#resizeW').hide();
 		$('#resizeSW').hide();
-		$('#resizeS').hide();	
+		$('#resizeS').hide();
 	};
 	/**
 	*
@@ -269,10 +269,10 @@
 	function enableResize(constraint)
 	{
 		hideHandlers();
-		var imageToResize = getImageElement();	
+		var imageToResize = getImageElement();
 		var imageContainer = $('#imageContainer');
 		var imageContainerTop = parseInt($(imageContainer).css('top').replace('px', ''));
-		var imageContainerLeft = parseInt($(imageContainer).css('left').replace('px', ''));		
+		var imageContainerLeft = parseInt($(imageContainer).css('left').replace('px', ''));
 		var resizeMe = $('#resizeMe');
 		var width = $('#width');
 		var height = $('#height');
@@ -284,7 +284,7 @@
 		$('#width').val($(imageToResize).attr('width'));
 		$('#height').val($(imageToResize).attr('height'));
 		$('#x').val(0);
-		$('#y').val(0);		
+		$('#y').val(0);
 		$(resizeMe).Resizable(
 			{
 				minWidth: 10,
@@ -305,29 +305,29 @@
 					$(imageToResize).attr('height', Math.round(size.height).toString());
 					$(imageToResize).attr('width', Math.round(size.width).toString());
 					$(width).val(Math.round(size.width));
-					$(height).val(Math.round(size.height));		
+					$(height).val(Math.round(size.height));
 					$(imageContainer).css('width', $(imageToResize).attr('width') + 'px');
-					$(imageContainer).css('height', $(imageToResize).attr('height') + 'px');	
-					$('#ratio').val($(resizeMe).ResizableRatio() );			
-					addImageHistory();				
+					$(imageContainer).css('height', $(imageToResize).attr('height') + 'px');
+					$('#ratio').val($(resizeMe).ResizableRatio() );
+					addImageHistory();
 				}
 
 			}
-		);	
+		);
 		$(resizeMe).ResizeConstraint(constraint);
 		if(typeof(constraint) == 'boolean' && constraint)
-		{		
+		{
 			$('#resizeS').hide();
-			$('#resizeE').hide();			
+			$('#resizeE').hide();
 		}else
-		{			
+		{
 			$('#resizeS').show();
 			$('#resizeE').show();
-		}		
+		}
 		$('#resizeSE').show();
-		$('#ratio').val($(resizeMe).ResizableRatio() );	
-			
-			
+		$('#ratio').val($(resizeMe).ResizableRatio() );
+
+
 	};
 	/**
 	*	initiate the position of handler
@@ -350,7 +350,7 @@
         //Init Container
         $(imageContainer).css('width', imageWidth + 'px');
         $(imageContainer).css('height', imageHeight + 'px');
-		
+
         //Init Overlay
 		$(imageToResize).css('opacity', '100');
         $(overlay).css('width', imageWidth + 'px');
@@ -375,8 +375,8 @@
 	{
 		hideHandlers();
 	toggleDisabledButton('actionRotateLeft', false);
-	toggleDisabledButton('actionRotateRight', false);			
-		
+	toggleDisabledButton('actionRotateRight', false);
+
 	};
 	/**
 	*	disable rotation function
@@ -384,14 +384,14 @@
 	function disableRotate()
 	{
 	toggleDisabledButton('actionRotateLeft', true);
-	toggleDisabledButton('actionRotateRight', true);			
+	toggleDisabledButton('actionRotateRight', true);
 	};
-	
+
 	function enableConstraint()
 	{
 		$('#constraint').removeAttr('disabled');
 	};
-	
+
 	function disableConstraint()
 	{
 		$('#constraint').attr('disabled', 'disabled');
@@ -400,46 +400,46 @@
 	{
 		$('#resizeSE').show();
 		$('#resizeE').show();
-		$('#resizeNE').show();	
+		$('#resizeNE').show();
 		$('#resizeN').show();
 		$('#resizeNW').show();
-		$('#resizeW').show();	
+		$('#resizeW').show();
 		$('#resizeSW').show();
-		$('#resizeS').show();	
+		$('#resizeS').show();
 	}	;
-	
+
 	/**
 	*	turn constraint on or off
 	*/
 	function toggleConstraint()
 	{
-		hideHandlers();	
+		hideHandlers();
 		if(document.formAction.constraint.checked)
 		{
 			$('#resizeMe').ResizeConstraint(true);
 			switch(getModeValue())
 			{
 				case "resize":
-					$('#resizeSE').show();	
+					$('#resizeSE').show();
 					break;
 				case "crop":
 					$('#resizeSE').show();
-					$('#resizeNE').show();	
+					$('#resizeNE').show();
 					$('#resizeNW').show();
 					$('#resizeSW').show();
-					
+
 					break;
 				case "rotate":
 					break;
 			}
-						
+
 		}else
 		{
 			$('#resizeMe').ResizeConstraint(false);
 			switch(getModeValue())
 			{
 				case "resize":
-					$('#resizeSE').show();	
+					$('#resizeSE').show();
 					$('#resizeE').show();
 					$('#resizeS').show();
 					break;
@@ -447,12 +447,12 @@
 					ShowHandlers();
 					break;
 				case "rotate":
-					break;					
-			}			
+					break;
+			}
 		}
-		
+
 	};
-	
+
 
 	/**
 	*	restore to the state the image was
@@ -463,40 +463,40 @@
 			{
 					if(!window.confirm(warningReset))
 					{
-						return false;	
+						return false;
 					}
 			}
-			
+
 			$("#imageContainer").empty();
-			$("#hiddenImage img").clone().appendTo("#imageContainer");		
+			$("#hiddenImage img").clone().appendTo("#imageContainer");
 			return true;
-			
-	
+
+
 	};
 	/*
 	*	left rotate
-	*/	
+	*/
 	function leftRotate()
 	{
-		
+
 		var imageToResize = getImageElement();
-		$(imageToResize).rotate(-90);		
+		$(imageToResize).rotate(-90);
 		swapWidthWithHeight();
 		addImageHistory();
 		var angle = $('#angle');
 
 		var angleDegree = (parseInt($(angle).val()) + 90);
 		angleDegree = ((angleDegree == 360)?angleDegree:angleDegree%360);
-		$(angle).val((angleDegree )); 
+		$(angle).val((angleDegree ));
 		return false;
-		
+
 	};
 	/**
 	*	cancel mode change
 	*/
 	function cancelChangeMode()
 	{
-		$('#formAction input[@value=' + $('#image_mode').val() + ']').attr('checked', 'checked');	
+		$('#formAction input[@value=' + $('#image_mode').val() + ']').attr('checked', 'checked');
 	};
 	/**
 	*	get the image element which is going to be modified
@@ -514,26 +514,26 @@
 		}
 		return imageElement;
 	};
-	/*	
+	/*
 		right rotate
 	*/
 	function rightRotate()
 	{
-		
+
 		var imageToResize = getImageElement();
-		$(imageToResize).rotate(90);	
+		$(imageToResize).rotate(90);
 		swapWidthWithHeight();
 		addImageHistory();
 		var angle = $('#angle');
 
-		
+
 		var angleDegree = (parseInt($(angle).val()) - 90 );
 		if(angleDegree < 0)
 		{
 			angleDegree += 360;
 		}
-		angleDegree = ((angleDegree == 360)?angleDegree:angleDegree%360);		
-		$(angle).val((angleDegree )); 
+		angleDegree = ((angleDegree == 360)?angleDegree:angleDegree%360);
+		$(angle).val((angleDegree ));
 		return false;
 	}	;
 	/**
@@ -544,22 +544,22 @@
 		var imageContainer = $('#imageContainer');
 		var resizeMe = $('#resizeMe');
 		var width = $('#width');
-		var height = $('#height');			
+		var height = $('#height');
 		var imageToResize = getImageElement();
 		var newWidth = 0;
 		var newHeight = 0;
 		newWidth = $(imageToResize).attr('width');
-		newHeight = $(imageToResize).attr('height');			
+		newHeight = $(imageToResize).attr('height');
 		$(imageContainer).css('width', newWidth + 'px');
-		$(imageContainer).css('height', newHeight + 'px');		
+		$(imageContainer).css('height', newHeight + 'px');
 		$(width).val(newWidth);
-		$(height).val(newHeight);	
+		$(height).val(newHeight);
 		$(resizeMe).css('width', newWidth + 'px');
 		$(resizeMe).css('height', newHeight + 'px');
-		
+
 
 
-				
+
 	};
 
 
@@ -573,22 +573,22 @@
 		imageHistory = true;
 		initDisabledButtons(false);
 	};
-	
-	
+
+
 	/**
 	*	cleare all records
 	*	this features will be implemented next release
-	*/	
+	*/
 	function clearImageHistory()
 	{
 		imageHistory = false;
 		initDisabledButtons(true);
-		
-		
+
+
 	};
-	
+
 	function initDisabledButtons(forceDisable)
-	{		
+	{
 		if(numSessionHistory)
 		{
 			toggleDisabledButton('actionUndo', false);
@@ -598,19 +598,19 @@
 		}
 		if(imageHistory)
 		{
-			toggleDisabledButton('actionSave', false);	
+			toggleDisabledButton('actionSave', false);
 			toggleDisabledButton('actionReset', false);
 		}else
 		{
-			toggleDisabledButton('actionSave', true);	
+			toggleDisabledButton('actionSave', true);
 			toggleDisabledButton('actionReset', true);
 		}
 	};
-	
+
 	/**
 	*	return record
 	*	this features will be implemented next release
-	*/		
+	*/
 	function getImageHistory()
 	{
 		return imageHistory;
@@ -618,20 +618,20 @@
 	/**
 	*	check if there exists any changes
 	*	this features will be implemented next release
-	*/		
+	*/
 	function isImageHistoryExist()
 	{
-		return imageHistory;		
+		return imageHistory;
 	};
-	
+
 function flipHorizontal()
 {
 	if(window.confirm(warningFlipHorizotal))
 	{
 		addImageHistory();
-		$('#flip_angle').val('horizontal');	
+		$('#flip_angle').val('horizontal');
 		$('#mode').val('flip');
-		saveImage();		
+		saveImage();
 	}
 
 	return false;
@@ -642,9 +642,9 @@ function flipVertical()
 	if(window.confirm(warningFlipVertical))
 	{
 	addImageHistory();
-	$('#flip_angle').val('vertical');	
+	$('#flip_angle').val('vertical');
 	$('#mode').val('flip');
-	saveImage();		
+	saveImage();
 	}
 
 	return false;
@@ -665,46 +665,46 @@ function toggleDisabledButton(buttonId, forceDisable)
 	var currentClass = $(disabledButton).attr('class') ;
 	if(typeof(forceDisable) == 'boolean')
 	{
-		
+
 		if(forceDisable && currentClass == 'button')
 		{
 			newClass = 'disabledButton';
-			$(disabledButton).attr('disabled', 'disabled');				
+			$(disabledButton).attr('disabled', 'disabled');
 		}else if(!forceDisable && currentClass == 'disabledButton')
 		{
 			newClass = 'button';
-			$(disabledButton).removeAttr('disabled');					
+			$(disabledButton).removeAttr('disabled');
 		}else
 		{
 			changeRequired = false;
 		}
-		
-		
+
+
 	}
 	else if(currentClass == 'button')
 	{
 		newClass = 'disabledButton';
-		$(disabledButton).attr('disabled', 'disabled');	
+		$(disabledButton).attr('disabled', 'disabled');
 	}else
 	{
 		newClass = 'button';
-		$(disabledButton).removeAttr('disabled');			
+		$(disabledButton).removeAttr('disabled');
 	}
 	if(changeRequired)
 	{
 	$(disabledButton).removeClass('button disabledButton');
-	$(disabledButton).addClass(newClass);			
+	$(disabledButton).addClass(newClass);
 	}
 
-	
+
 };
 
 function disableFlip()
 {
 	toggleDisabledButton('actionFlipH', true);
-	toggleDisabledButton('actionFlipV', true);	
+	toggleDisabledButton('actionFlipV', true);
 };
-	
+
 	function undoImage()
 	{
 		if(numSessionHistory < 1)
@@ -717,12 +717,12 @@ function disableFlip()
 			{
 				processImage('formAction');
 			}
-			
+
 		}
 		return false;
-		
-	};	
-	
+
+	};
+
 function processImage(formId)
 {
 			$("#loading")
@@ -731,28 +731,28 @@ function processImage(formId)
 			   })
 			   .ajaxComplete(function(){
 				   $(this).hide();
-			   });	
-			var options = 
-			{ 
+			   });
+			var options =
+			{
 				dataType: 'json',
-				error: function (data, status, e) 
+				error: function (data, status, e)
 				{
 					alert(e);
-				},				
-				success: function(data) 
-				{ 
+				},
+				success: function(data)
+				{
 					if(typeof(data.error) == 'undefined')
 					{
 						alert('Unexpected information ');
 					}
 					else if(data.error != '')
 					{
-						
+
 						alert(data.error);
 					}else
 					{
 						$("#loading").show();
-						
+
 								currentFolder = data.folder_path;
 								if(data.save_as == '1')
 								{
@@ -765,28 +765,28 @@ function processImage(formId)
 								$('#path').val(data.path);
 				        var preImage = new Image();
 								preImage.width = data.width;
-								preImage.height = data.height;													
+								preImage.height = data.height;
 				        preImage.onload = function()
-				        {				
-				          
-									$('#hiddenImage').empty();														
+				        {
+
+									$('#hiddenImage').empty();
 									$(preImage).appendTo('#hiddenImage');
-									
-									changeMode(false, true);		
-									$('#loading').hide(); 		
+
+									changeMode(false, true);
+									$('#loading').hide();
 									$('#windowSaveAs').jqm({modal: true}).jqmHide();
-				             
+
 				        };
 						var now = new Date();
 				        preImage.src = data.path + "?" + now.getTime();
 
-								
-										
-						
+
+
+
 					}
-				} 
-			}; 
-			$('#' + formId).ajaxSubmit(options); 		
+				}
+			};
+			$('#' + formId).ajaxSubmit(options);
 			return false;
 };
 
@@ -795,7 +795,7 @@ function saveAsImagePre()
 	$('#windowSaveAs').jqm({modal: true}).jqmShow();
 	var saveTo = $('#save_to');
 	$(saveTo).removeOption(/./);
-	$(saveTo).ajaxAddOption(urlGetFolderList, {}, false, 
+	$(saveTo).ajaxAddOption(urlGetFolderList, {}, false,
 														function()
 														{
 																$(saveTo).selectOptions(currentFolder);
@@ -807,32 +807,32 @@ function saveAsImage()
 {
 
 	var pattern=/^[A-Za-z0-9_ \-]+$/i;
-	
+
 	var newName = $('#new_name');
-	
+
 	var saveAs = $('#save_to').get(0);
 	//alert($(saveAs).val());
 	if(!pattern.test($(newName).val()))
 	{
-		alert(warningInvalidNewName);	
+		alert(warningInvalidNewName);
 	}else if(saveAs.selectedIndex < 0)
 	{
 		alert(warningNoFolderSelected);
 	}else
-	{	
-	
+	{
+
 		$('#hidden_new_name').val($(newName).val());
 		$('#hidden_save_to').val(saveAs.options[saveAs.selectedIndex].value);
 		if(saveImage(true))
 		{
-			
-			
+
+
 		}
-		
-		
+
+
 	}
-	
-	
+
+
 	return false;
 };
 
@@ -840,7 +840,7 @@ function saveImage(saveAs)
 {
 	if(typeof(saveAs) == 'boolean' && saveAs)
 	{
-		
+
 	}else
 	{//remove new name if just normal save
 		$('#hidden_new_name').val('');
@@ -851,14 +851,14 @@ function saveImage(saveAs)
 		alert(noChangeMadeBeforeSave);
 	}else
 	{
-		
+
 		if(processImage('formImageInfo'))
-		{			
+		{
 			return true;
 		}
 	}
 	return false;
-	
+
 };
 
 

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/ajaximageeditor_c.js


+ 29 - 29
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/ajaxtexteditor.js

@@ -2,75 +2,75 @@
 			{
 				jQuery('#text').val(text);
 				jQuery('#save_as_request').val('0');
-				jQuery('#name').val(currentName);					
-				jQuery('#folder').val(currentFolder);				
+				jQuery('#name').val(currentName);
+				jQuery('#folder').val(currentFolder);
 				do_save(false);
 			};
 			function do_save(saveAsRequest)
 			{
 				jQuery('#windowProcessing').jqmShow();
 
-			var options = 
-			{ 
+			var options =
+			{
 				dataType: 'json',
-				error: function (data, status, e) 
+				error: function (data, status, e)
 				{
 					alert(e);
-				},				
-				success: function(data) 
-				{ 
+				},
+				success: function(data)
+				{
 										if(typeof(data.error) == 'undefined')
 										{
 											alert('Unexpected information ');
 
 											if(typeof(saveAsRequest) == 'boolean' && saveAsRequest)
 											{
-												jQuery('#windowSaveAs').jqmShow();		
-											}											
+												jQuery('#windowSaveAs').jqmShow();
+											}
 										}
 										else if(data.error != '')
 										{
 											alert(data.error);
-											jQuery('#windowProcessing').jqmHide();											
+											jQuery('#windowProcessing').jqmHide();
 											if(typeof(saveAsRequest) == 'boolean' && saveAsRequest)
 											{
-												jQuery('#windowSaveAs').jqmShow();		
+												jQuery('#windowSaveAs').jqmShow();
 											}
 										}else
-										{													
+										{
 											jQuery('#windowProcessing').jqmHide();
 											jQuery('#windowSaveAs').jqmHide();
 											currentFolder = data.folder;
 											currentName = data.name;
 										}
-				} 
-			}; 
-			jQuery('#frmProcessing').ajaxSubmit(options); 		
+				}
+			};
+			jQuery('#frmProcessing').ajaxSubmit(options);
 			};
 			function save_as(id, text)
 			{
-				
+
 				jQuery('#text').val(text);
 				jQuery('#windowSaveAs').jqmShow();
 				var saveTo = jQuery('#save_to');
 				jQuery(saveTo).removeOption(/./);
-				jQuery(saveTo).ajaxAddOption(urlGetFolderList, {}, false, 
+				jQuery(saveTo).ajaxAddOption(urlGetFolderList, {}, false,
 																	function()
 																	{
 																			jQuery(saveTo).selectOptions(currentFolder);
-																		});				
-	
-			  
+																		});
+
+
 			};
 			function do_save_as()
 			{
-				var pattern=/^[A-Za-z0-9_ \-]+$/i;				
-				var newName = jQuery('#new_name');				
+				var pattern=/^[A-Za-z0-9_ \-]+$/i;
+				var newName = jQuery('#new_name');
 				var saveAs = jQuery('#save_to').get(0);
 				var ext = jQuery('#ext').get(0);
 				if(!pattern.test(jQuery(newName).val()))
 				{
-					alert(warningInvalidName);	
+					alert(warningInvalidName);
 				}else if(saveAs.selectedIndex < 0)
 				{
 					alert(waringFolderNotSelected);
@@ -79,13 +79,13 @@
 					alert(warningExtNotSelected);
 				}
 				else
-				{			
-					
-					jQuery('#name').val(jQuery(newName).val() + "." + ext.options[ext.selectedIndex].value);					
+				{
+
+					jQuery('#name').val(jQuery(newName).val() + "." + ext.options[ext.selectedIndex].value);
 					jQuery('#folder').val(saveAs.options[saveAs.selectedIndex].value);
 					jQuery('#save_as_request').val('1');
-					jQuery('#windowSaveAs').jqmHide();	
+					jQuery('#windowSaveAs').jqmHide();
 					do_save(true);
 				}
-				return false;						
+				return false;
 			};

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/ajaxtexteditor_c.js


+ 2 - 2
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/edit_area/reg_syntax/css.js

@@ -36,7 +36,7 @@ editAreaLoader.load_syntax["css"] = {
 		,'values' : [
 			'above', 'absolute', 'always', 'armenian', 'aural', 'auto', 'avoid',
 			'baseline', 'behind', 'below', 'bidi-override', 'black', 'blue', 'blink', 'block', 'bold', 'bolder', 'both',
-			'capitalize', 'center-left', 'center-right', 'center', 'circle', 'cjk-ideographic', 
+			'capitalize', 'center-left', 'center-right', 'center', 'circle', 'cjk-ideographic',
             'close-quote', 'collapse', 'condensed', 'continuous', 'crop', 'crosshair', 'cross', 'cursive',
 			'dashed', 'decimal-leading-zero', 'decimal', 'default', 'digits', 'disc', 'dotted', 'double',
 			'e-resize', 'embed', 'extra-condensed', 'extra-expanded', 'expanded',
@@ -79,6 +79,6 @@ editAreaLoader.load_syntax["css"] = {
 			}
 		,'OPERATORS' : 'color: #FF00FF;'
 		,'DELIMITERS' : 'color: #60CA00;'
-				
+
 	}
 };

+ 2 - 2
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/edit_area/reg_syntax/html.js

@@ -45,6 +45,6 @@ editAreaLoader.load_syntax["html"] = {
 			,'tags': 'color: #E62253;'
 			,'doctype': 'color: #8DCFB5;'
 			,'test': 'color: #00FF00;'
-		}	
-	}		
+		}
+	}
 };

+ 18 - 18
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/edit_area/reg_syntax/js.js

@@ -13,30 +13,30 @@ editAreaLoader.load_syntax["js"] = {
  		,'keywords' : [
 			'class', 'const', 'default', 'debugger', 'export', 'extends', 'false',
 			'function', 'import', 'namespace', 'new', 'null', 'package', 'private',
-			'protected', 'public', 'super', 'true', 'use', 'var', 'window', 'document',		
+			'protected', 'public', 'super', 'true', 'use', 'var', 'window', 'document',
 			// the list below must be sorted and checked (if it is a keywords or a function and if it is not present twice
-			'Link ', 'outerHeight ', 'Anchor', 'FileUpload', 
-			'location', 'outerWidth', 'Select', 'Area', 'find', 'Location', 'Packages', 'self', 
-			'arguments', 'locationbar', 'pageXoffset', 'Form', 
-			'Math', 'pageYoffset', 'setTimeout', 'assign', 'Frame', 'menubar', 'parent', 'status', 
-			'blur', 'frames', 'MimeType', 'parseFloat', 'statusbar', 'Boolean', 'Function', 'moveBy', 
-			'parseInt', 'stop', 'Button', 'getClass', 'moveTo', 'Password', 'String', 'callee', 'Hidden', 
-			'name', 'personalbar', 'Submit', 'caller', 'history', 'NaN', 'Plugin', 'sun', 'captureEvents', 
-			'History', 'navigate', 'print', 'taint', 'Checkbox', 'home', 'navigator', 'prompt', 'Text', 
-			'Image', 'Navigator', 'prototype', 'Textarea', 'clearTimeout', 'Infinity', 
-			'netscape', 'Radio', 'toolbar', 'close', 'innerHeight', 'Number', 'ref', 'top', 'closed', 
-			'innerWidth', 'Object', 'RegExp', 'toString', 'confirm', 'isFinite', 'onBlur', 'releaseEvents', 
-			'unescape', 'constructor', 'isNan', 'onError', 'Reset', 'untaint', 'Date', 'java', 'onFocus', 
-			'resizeBy', 'unwatch', 'defaultStatus', 'JavaArray', 'onLoad', 'resizeTo', 'valueOf', 'document', 
-			'JavaClass', 'onUnload', 'routeEvent', 'watch', 'Document', 'JavaObject', 'open', 'scroll', 'window', 
-			'Element', 'JavaPackage', 'opener', 'scrollbars', 'Window', 'escape', 'length', 'Option', 'scrollBy'			
+			'Link ', 'outerHeight ', 'Anchor', 'FileUpload',
+			'location', 'outerWidth', 'Select', 'Area', 'find', 'Location', 'Packages', 'self',
+			'arguments', 'locationbar', 'pageXoffset', 'Form',
+			'Math', 'pageYoffset', 'setTimeout', 'assign', 'Frame', 'menubar', 'parent', 'status',
+			'blur', 'frames', 'MimeType', 'parseFloat', 'statusbar', 'Boolean', 'Function', 'moveBy',
+			'parseInt', 'stop', 'Button', 'getClass', 'moveTo', 'Password', 'String', 'callee', 'Hidden',
+			'name', 'personalbar', 'Submit', 'caller', 'history', 'NaN', 'Plugin', 'sun', 'captureEvents',
+			'History', 'navigate', 'print', 'taint', 'Checkbox', 'home', 'navigator', 'prompt', 'Text',
+			'Image', 'Navigator', 'prototype', 'Textarea', 'clearTimeout', 'Infinity',
+			'netscape', 'Radio', 'toolbar', 'close', 'innerHeight', 'Number', 'ref', 'top', 'closed',
+			'innerWidth', 'Object', 'RegExp', 'toString', 'confirm', 'isFinite', 'onBlur', 'releaseEvents',
+			'unescape', 'constructor', 'isNan', 'onError', 'Reset', 'untaint', 'Date', 'java', 'onFocus',
+			'resizeBy', 'unwatch', 'defaultStatus', 'JavaArray', 'onLoad', 'resizeTo', 'valueOf', 'document',
+			'JavaClass', 'onUnload', 'routeEvent', 'watch', 'Document', 'JavaObject', 'open', 'scroll', 'window',
+			'Element', 'JavaPackage', 'opener', 'scrollbars', 'Window', 'escape', 'length', 'Option', 'scrollBy'
 		]
     	,'functions' : [
 			// common functions for Window object
 			'alert', 'Array', 'back', 'blur', 'clearInterval', 'close', 'confirm', 'eval ', 'focus', 'forward', 'home',
 			'name', 'navigate', 'onblur', 'onerror', 'onfocus', 'onload', 'onmove',
 			'onresize', 'onunload', 'open', 'print', 'prompt', 'scroll', 'scrollTo', 'setInterval', 'status',
-			'stop' 
+			'stop'
 		]
 	}
 	,'OPERATORS' :[
@@ -55,6 +55,6 @@ editAreaLoader.load_syntax["js"] = {
 		}
 		,'OPERATORS' : 'color: #FF00FF;'
 		,'DELIMITERS' : 'color: #0038E1;'
-				
+
 	}
 };

+ 2 - 2
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/edit_area/reg_syntax/php.js

@@ -24,7 +24,7 @@ editAreaLoader.load_syntax["php"] = {
 			'PHP_OUTPUT_HANDLER_END', 'E_ERROR', 'E_WARNING', 'E_PARSE', 'E_NOTICE',
 			'E_CORE_ERROR', 'E_CORE_WARNING', 'E_COMPILE_ERROR', 'E_COMPILE_WARNING', 'E_USER_ERROR',
 			'E_USER_WARNING', 'E_USER_NOTICE', 'E_ALL'
-			
+
 		]
 		,'functions' : [
 			'func_num_args', 'func_get_arg', 'func_get_args', 'strlen', 'strcmp', 'strncmp', 'strcasecmp', 'strncasecmp', 'each', 'error_reporting', 'define', 'defined',
@@ -70,6 +70,6 @@ editAreaLoader.load_syntax["php"] = {
 		,'DELIMITERS' : 'color: #2B60FF;'
 		,'REGEXPS' : {
 			'variables' : 'color: #E0BD54;'
-		}		
+		}
 	}
 };

+ 12 - 12
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/edit_area/reg_syntax/python.js

@@ -1,8 +1,8 @@
 /**
- * Python syntax v 1.1 
- * 
+ * Python syntax v 1.1
+ *
  * v1.1 by Andre Roberge (2006/12/27)
- *   
+ *
 **/
 editAreaLoader.load_syntax["python"] = {
 	'COMMENT_SINGLE' : {1 : '#'}
@@ -17,7 +17,7 @@ editAreaLoader.load_syntax["python"] = {
 		*/
 		'reserved' : [
 			'and', 'as', 'assert', 'break', 'class', 'continue', 'def', 'del', 'elif',
-			'else', 'except', 'exec', 'finally', 'for', 'from', 'global', 'if', 
+			'else', 'except', 'exec', 'finally', 'for', 'from', 'global', 'if',
 			'import', 'is', 'in', 'lambda', 'not', 'or', 'pass', 'print', 'raise',
 			'return', 'try', 'while', 'with', 'yield'
 			//the following are *almost* reserved; we'll treat them as such
@@ -26,15 +26,15 @@ editAreaLoader.load_syntax["python"] = {
 		/*
 		** Set 2: builtins
 		** http://python.org/doc/current/lib/built-in-funcs.html
-		*/	
+		*/
 		,'builtins' : [
-			'__import__', 'abs', 'basestring', 'bool', 'callable', 'chr', 'classmethod', 'cmp', 
-			'compile', 'complex', 'delattr', 'dict', 'dir', 'divmod', 'enumerate', 'eval', 'execfile', 
+			'__import__', 'abs', 'basestring', 'bool', 'callable', 'chr', 'classmethod', 'cmp',
+			'compile', 'complex', 'delattr', 'dict', 'dir', 'divmod', 'enumerate', 'eval', 'execfile',
 			'file', 'filter', 'float', 'frozenset', 'getattr', 'globals', 'hasattr', 'hash', 'help',
 			'hex', 'id', 'input', 'int', 'isinstance', 'issubclass', 'iter', 'len', 'list', 'locals',
 			'long', 'map', 'max', 'min', 'object', 'oct', 'open', 'ord', 'pow', 'property', 'range',
 			'raw_input', 'reduce', 'reload', 'repr', 'reversed', 'round', 'set', 'setattr', 'slice',
-			'sorted', 'staticmethod', 'str', 'sum', 'super', 'tuple', 'type', 'unichr', 'unicode', 
+			'sorted', 'staticmethod', 'str', 'sum', 'super', 'tuple', 'type', 'unichr', 'unicode',
 			'vars', 'xrange', 'zip',
 			// Built-in constants: http://www.python.org/doc/2.4.1/lib/node35.html
 			//'False', 'True', 'None' have been included in 'reserved'
@@ -48,7 +48,7 @@ editAreaLoader.load_syntax["python"] = {
 			'UnboundlocalError', 'UnicodeError', 'UnicodeEncodeError', 'UnicodeDecodeError',
 			'UnicodeTranslateError', 'ValueError', 'WindowsError', 'ZeroDivisionError', 'Warning',
 			'UserWarning', 'DeprecationWarning', 'PendingDeprecationWarning', 'SyntaxWarning',
-			'RuntimeWarning', 'FutureWarning',		
+			'RuntimeWarning', 'FutureWarning',
 			// we will include the string methods as well
 			// http://python.org/doc/current/lib/string-methods.html
 			'capitalize', 'center', 'count', 'decode', 'encode', 'endswith', 'expandtabs',
@@ -100,14 +100,14 @@ editAreaLoader.load_syntax["python"] = {
 		*/
 		,'special' : [
 			// Basic customization: http://python.org/doc/current/ref/customization.html
-			'__new__', '__init__', '__del__', '__repr__', '__str__', 
+			'__new__', '__init__', '__del__', '__repr__', '__str__',
 			'__lt__', '__le__', '__eq__', '__ne__', '__gt__', '__ge__', '__cmp__', '__rcmp__',
 			'__hash__', '__nonzero__', '__unicode__', '__dict__',
 			// Attribute access: http://python.org/doc/current/ref/attribute-access.html
 			'__setattr__', '__delattr__', '__getattr__', '__getattribute__', '__get__', '__set__',
 			'__delete__', '__slots__',
 			// Class creation, callable objects
-			'__metaclass__', '__call__', 
+			'__metaclass__', '__call__',
 			// Container types: http://python.org/doc/current/ref/sequence-types.html
 			'__len__', '__getitem__', '__setitem__', '__delitem__', '__iter__', '__contains__',
 			'__getslice__', '__setslice__', '__delslice__',
@@ -139,6 +139,6 @@ editAreaLoader.load_syntax["python"] = {
 			}
 		,'OPERATORS' : 'color: #993300;'
 		,'DELIMITERS' : 'color: #993300;'
-				
+
 	}
 };

+ 2 - 2
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/edit_area/reg_syntax/xml.js

@@ -51,6 +51,6 @@ editAreaLoader.load_syntax["xml"] = {
 			,'tags': 'color: #E62253;'
 			,'xml': 'color: #8DCFB5;'
 			,'cdata': 'color: #50B020;'
-		}	
-	}		
+		}
+	}
 };

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/for_form.js

@@ -2,7 +2,7 @@ function selectFile(url)
 {
       window.opener.document.getElementById(elementId).value = url;
       window.close() ;
- 
+
 
 }
 

+ 5 - 5
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/for_tinymce.js

@@ -111,7 +111,7 @@ tinyMCEPopup = {
 		t.editor.windowManager.close(window, t.id);
 	},
 
-	// Internal functions	
+	// Internal functions
 
 	_restoreSelection : function() {
 		var e = window.event.srcElement;
@@ -226,9 +226,9 @@ function selectFile(url)
 {
 	if(typeof(url) != 'undefined')
 	{
-		
+
 	}
-	
+
 	if(url != '')
 	{
 		var win = tinyMCEPopup.getWindowArg("window");
@@ -236,9 +236,9 @@ function selectFile(url)
         //for image browsers
         try { win.ImageDialog.showPreviewImage(url); }
         catch (e) { void(e); }
-        tinyMCEPopup.close();   		
+        tinyMCEPopup.close();
 	}
-    
+
 }
 
 function cancelSelectFile()

+ 12 - 12
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/form.js

@@ -226,7 +226,7 @@ $.fn.ajaxSubmit = function(options) {
     var files = $('input:file', this).fieldValue();
     var found = false;
     for (var j=0; j < files.length; j++)
-        if (files[j]) 
+        if (files[j])
             found = true;
 
     if (options.iframe || found) // options.iframe allows user to force iframe mode
@@ -243,7 +243,7 @@ $.fn.ajaxSubmit = function(options) {
     function fileUpload() {
         var form = $form[0];
         var opts = $.extend({}, $.ajaxSettings, options);
-        
+
         var id = 'jqFormIO' + $.fn.ajaxSubmit.counter++;
         var $io = $('<iframe id="' + id + '" name="' + id + '" />');
         var io = $io[0];
@@ -260,21 +260,21 @@ $.fn.ajaxSubmit = function(options) {
             getResponseHeader: function() {},
             setRequestHeader: function() {}
         };
-        
+
         var g = opts.global;
         // trigger ajax global events so that activity/block indicators work like normal
         if (g && ! $.active++) $.event.trigger("ajaxStart");
         if (g) $.event.trigger("ajaxSend", [xhr, opts]);
-        
+
         var cbInvoked = 0;
         var timedOut = 0;
-        
+
         // take a breath so that pending repaints get some cpu time before the upload starts
         setTimeout(function() {
             $io.appendTo('body');
             // jQuery's event binding doesn't work for iframe events in IE
             io.attachEvent ? io.attachEvent('onload', cb) : io.addEventListener('load', cb, false);
-            
+
             // make sure form attrs are set
             var encAttr = form.encoding ? 'encoding' : 'enctype';
             var t = $form.attr('target');
@@ -292,10 +292,10 @@ $.fn.ajaxSubmit = function(options) {
             form.submit();
             $form.attr('target', t); // reset target
         }, 10);
-        
+
         function cb() {
             if (cbInvoked++) return;
-            
+
             io.detachEvent ? io.detachEvent('onload', cb) : io.removeEventListener('load', cb, false);
 
             var ok = true;
@@ -306,7 +306,7 @@ $.fn.ajaxSubmit = function(options) {
                 doc = io.contentWindow ? io.contentWindow.document : io.contentDocument ? io.contentDocument : io.document;
                 xhr.responseText = doc.body ? doc.body.innerHTML : null;
                 xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
-                
+
                 if (opts.dataType == 'json' || opts.dataType == 'script') {
                     var ta = doc.getElementsByTagName('textarea')[0];
                     data = ta ? ta.value : xhr.responseText;
@@ -339,12 +339,12 @@ $.fn.ajaxSubmit = function(options) {
             if (opts.complete) opts.complete(xhr, ok ? 'success' : 'error');
 
             // clean up
-            setTimeout(function() { 
-                $io.remove(); 
+            setTimeout(function() {
+                $io.remove();
                 xhr.responseXML = null;
             }, 100);
         };
-        
+
         function toXml(s, doc) {
             if (window.ActiveXObject) {
                 doc = new ActiveXObject('Microsoft.XMLDOM');

+ 16 - 16
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/interface.js

@@ -215,7 +215,7 @@ jQuery.iUtil = {
 	fixPNG : function (el, emptyGIF) {
 		var images = jQuery('img[@src*="png"]', el||document), png;
 		images.each( function() {
-			png = this.src;				
+			png = this.src;
 			this.src = emptyGIF;
 			this.style.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + png + "')";
 		});
@@ -398,7 +398,7 @@ jQuery.iResize = {
 						jQuery.iResize.resizeElement.resizeOptions.maxHeight
 					);
 	},
-	
+
 	/**
 	*	setting and getting the ratio value
 	* 	defined by Logan Cai cailongqun [at] yahoo [dot] com [dot] cn
@@ -411,7 +411,7 @@ jQuery.iResize = {
 				var el = this;
 				if(typeof(value) == 'integer')
 				{//setting new ratio
-					el.resizeOptions.ratio = value;	
+					el.resizeOptions.ratio = value;
 				}else
 				{//getting the ratio
 					if(el.resizeOptions.ratio)
@@ -420,7 +420,7 @@ jQuery.iResize = {
 					}else
 					{
 						var width =  parseInt(jQuery(el).css('width')) || 0;
-						var height = parseInt(jQuery(el).css('height'))|| 0;	
+						var height = parseInt(jQuery(el).css('height'))|| 0;
 						if(width > 0 && height > 0)
 						{
 							ratio = (Math.round(height/width * 10000)/10000);
@@ -431,11 +431,11 @@ jQuery.iResize = {
 					}
 				}
 			}
-			
+
 		);
-		return ratio;	
-		
-	},	
+		return ratio;
+
+	},
 	/**
 	*	setting and getting the ratio value
 	* 	defined by Logan Cai cailongqun [at] yahoo [dot] com [dot] cn
@@ -443,7 +443,7 @@ jQuery.iResize = {
 	ResizeConstraint: function(OnOrOff)
 	{
 		var ratio;
-		
+
 		this.each(
 			function()
 			{
@@ -454,7 +454,7 @@ jQuery.iResize = {
 				}else
 				{//turn on the resize constraint and set the ratio calculated from current image width & height
 					var width =  parseInt(jQuery(el).css('width')) || 0;
-					var height = parseInt(jQuery(el).css('height'))|| 0;	
+					var height = parseInt(jQuery(el).css('height'))|| 0;
 					if(width > 0 && height > 0)
 					{
 						el.resizeOptions.ratio = (Math.round(height/width * 10000)/10000);
@@ -464,11 +464,11 @@ jQuery.iResize = {
 					}
 				}
 			}
-			
+
 		);
-		
-	},	
-	
+
+	},
+
 	move: function(e) {
 		if (jQuery.iResize.resizeElement == null) {
 			return;
@@ -723,7 +723,7 @@ jQuery.iResize = {
 jQuery.fn.extend ({
 		/**
 		 * Create a resizable element with a number of advanced options including callback, dragging
-		 * 
+		 *
 		 * @name Resizable
 		 * @description Create a resizable element with a number of advanced options including callback, dragging
 		 * @param Hash hash A hash of parameters. All parameters are optional.
@@ -753,7 +753,7 @@ jQuery.fn.extend ({
 		ResizeConstraint: jQuery.iResize.ResizeConstraint,
 		/**
 		 * Destroy a resizable
-		 * 
+		 *
 		 * @name ResizableDestroy
 		 * @description Destroy a resizable
 		 * @type jQuery

+ 15 - 15
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/iresizable.js

@@ -161,7 +161,7 @@ jQuery.iResize = {
 						jQuery.iResize.resizeElement.resizeOptions.maxHeight
 					);
 	},
-	
+
 	/**
 	*	setting and getting the ratio value
 	* 	defined by Logan Cai cailongqun [at] yahoo [dot] com [dot] cn
@@ -174,7 +174,7 @@ jQuery.iResize = {
 				var el = this;
 				if(typeof(value) == 'integer')
 				{//setting new ratio
-					el.resizeOptions.ratio = value;	
+					el.resizeOptions.ratio = value;
 				}else
 				{//getting the ratio
 					if(el.resizeOptions.ratio)
@@ -183,7 +183,7 @@ jQuery.iResize = {
 					}else
 					{
 						var width =  parseInt(jQuery(el).css('width')) || 0;
-						var height = parseInt(jQuery(el).css('height'))|| 0;	
+						var height = parseInt(jQuery(el).css('height'))|| 0;
 						if(width > 0 && height > 0)
 						{
 							ratio = (Math.round(height/width * 10000)/10000);
@@ -194,11 +194,11 @@ jQuery.iResize = {
 					}
 				}
 			}
-			
+
 		);
-		return ratio;	
-		
-	},	
+		return ratio;
+
+	},
 	/**
 	*	setting and getting the ratio value
 	* 	defined by Logan Cai cailongqun [at] yahoo [dot] com [dot] cn
@@ -206,7 +206,7 @@ jQuery.iResize = {
 	ResizeConstraint: function(OnOrOff)
 	{
 		var ratio;
-		
+
 		this.each(
 			function()
 			{
@@ -217,7 +217,7 @@ jQuery.iResize = {
 				}else
 				{//turn on the resize constraint and set the ratio calculated from current image width & height
 					var width =  parseInt(jQuery(el).css('width')) || 0;
-					var height = parseInt(jQuery(el).css('height'))|| 0;	
+					var height = parseInt(jQuery(el).css('height'))|| 0;
 					if(width > 0 && height > 0)
 					{
 						el.resizeOptions.ratio = (Math.round(height/width * 10000)/10000);
@@ -227,11 +227,11 @@ jQuery.iResize = {
 					}
 				}
 			}
-			
+
 		);
-		
-	},	
-	
+
+	},
+
 	move: function(e) {
 		if (jQuery.iResize.resizeElement == null) {
 			return;
@@ -486,7 +486,7 @@ jQuery.iResize = {
 jQuery.fn.extend ({
 		/**
 		 * Create a resizable element with a number of advanced options including callback, dragging
-		 * 
+		 *
 		 * @name Resizable
 		 * @description Create a resizable element with a number of advanced options including callback, dragging
 		 * @param Hash hash A hash of parameters. All parameters are optional.
@@ -516,7 +516,7 @@ jQuery.fn.extend ({
 		ResizeConstraint: jQuery.iResize.ResizeConstraint,
 		/**
 		 * Destroy a resizable
-		 * 
+		 *
 		 * @name ResizableDestroy
 		 * @description Destroy a resizable
 		 * @type jQuery

+ 1 - 1
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/iutil.js

@@ -227,7 +227,7 @@ jQuery.iUtil = {
 	fixPNG : function (el, emptyGIF) {
 		var images = jQuery('img[@src*="png"]', el||document), png;
 		images.each( function() {
-			png = this.src;				
+			png = this.src;
 			this.src = emptyGIF;
 			this.style.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + png + "')";
 		});

+ 13 - 13
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/media.js

@@ -48,14 +48,14 @@ $.fn.media = function(options, f1, f2) {
         var o = getSettings(this, options);
         // pre-conversion callback, passes original element and fully populated options
         if (typeof f1 == 'function') f1(this, o);
-        
+
         var r = getTypesRegExp();
         var m = r.exec(o.src) || [''];
         o.type ? m[0] = o.type : m.shift();
         for (var i=0; i < m.length; i++) {
             fn = m[i].toLowerCase();
             if (isDigit(fn[0])) fn = 'fn' + fn; // fns can't begin with numbers
-            if (!$.fn.media[fn]) 
+            if (!$.fn.media[fn])
                 continue;  // unrecognized media type
             // normalize autoplay settings
             var player = $.fn.media[fn+'_player'];
@@ -67,7 +67,7 @@ $.fn.media = function(options, f1, f2) {
             var $div = $.fn.media[fn](this, o);
 
             $div.css('backgroundColor', o.bgColor).width(o.width);
-            
+
             // post-conversion callback, passes original element, new div element and fully populated options
             if (typeof f2 == 'function') f2(this, $div[0], o, player.name);
             break;
@@ -112,7 +112,7 @@ $.fn.mediabox = function(options, css) {
             });
         if (o.boxTitle)
             $div.prepend('<div style="margin:0;padding:0">' + o.boxTitle + '</div>');
-        
+
         if (css) $div.css(css);
 
         $div.displayBox( { width: o.width, height: o.height }, function(el) {
@@ -127,7 +127,7 @@ $.fn.mediabox = function(options, css) {
     });
 };
 
-  
+
 /**
  * Non-chainable method for adding or changing file format / player mapping
  * @name mapFormat
@@ -153,15 +153,15 @@ $.fn.media.defaults = {
     attrs:         {},        // added to object and embed elements as attrs
     flashvars:     {},        // added to flash content as flashvars param/attr
     flashVersion:  '7',       // required flash version
-    
+
     // MediaBox options
     boxTitle:      null,      // MediaBox titlebar
     loadingImage:  null,      // MediaBox loading indicator
-    
+
     // default flash video and mp3 player (@see: http://jeroenwijering.com/?item=Flash_Media_Player)
     flvPlayer:     'mediaplayer.swf',
     mp3Player:     'mediaplayer.swf',
-    
+
     // @see http://msdn2.microsoft.com/en-us/library/bb412401.aspx
     silverlight: {
         inplaceInstallPrompt: 'true', // display in-place install prompt?
@@ -188,7 +188,7 @@ $.fn.media.defaults.players = {
         eAttrs: {
             type:         'application/x-shockwave-flash',
             pluginspage:  'http://www.adobe.com/go/getflashplayer'
-        }        
+        }
     },
     quicktime: {
         name:         'quicktime',
@@ -225,7 +225,7 @@ $.fn.media.defaults.players = {
         eAttrs: {
             type:         'application/x-mplayer2',
             pluginspage:  'http://www.microsoft.com/Windows/MediaPlayer/'
-        }        
+        }
     },
     // special cases
     iframe: {
@@ -277,7 +277,7 @@ function isDigit(c) {
 function getSettings(el, options) {
     options = options || {};
     var $el = $(el);
-    
+
     var cls = el.className || '';
     var meta = $.meta ? $el.data() : {};
     var w = meta.width  || parseInt(((cls.match(/w:(\d+)/)||[])[1]||0));
@@ -378,7 +378,7 @@ $.fn.media.xaml = function(el, opts) {
     var cls = opts.cls ? (' class="' + opts.cls + '"') : '';
     var $div = $('<div' + id1 + cls + '>');
     $(el).after($div).remove();
-    
+
     Sys.Silverlight.createObjectEx({
         source: opts.src,
         initParams: opts.silverlight.initParams,
@@ -399,7 +399,7 @@ $.fn.media.xaml = function(el, opts) {
 function generate(el, opts, player) {
     var $el = $(el);
     var o = $.fn.media.defaults.players[player];
-    
+
     if (player == 'iframe') {
         var o = $('<iframe' + ' width="' + opts.width + '" height="' + opts.height + '" >');
         o.attr('src', opts.src);

+ 2 - 2
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/rotate.js

@@ -30,10 +30,10 @@ jQuery.fn.rotate = function(angle,whence) {
 			canvas.oImage = new Image();
 			canvas.oImage.src = p.src;
 	    	canvas.oImage.width = p.width;
-    		canvas.oImage.height = p.height;			
+    		canvas.oImage.height = p.height;
 		} else {
 			canvas.oImage = p.oImage;
-			
+
 		}
 
 		canvas.style.width = canvas.width = Math.abs(costheta*canvas.oImage.width) + Math.abs(sintheta*canvas.oImage.height);

+ 50 - 50
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/thickbox.js

@@ -4,13 +4,13 @@
  * Copyright (c) 2007 cody lindley
  * Licensed under the MIT License: http://www.opensource.org/licenses/mit-license.php
 */
-		  
+
 /*var tb_pathToImage = "images/loadingAnimation.gif";*/
 
 /*!!!!!!!!!!!!!!!!! edit below this line at your own risk !!!!!!!!!!!!!!!!!!!!!!!*/
 
 //on page load call tb_init
-$(document).ready(function(){   
+$(document).ready(function(){
 	//tb_init('a.thickbox, area.thickbox, input.thickbox');//pass where to apply thickbox
 	imgLoader = new Image();// preload image
 	imgLoader.src = tb_pathToImage;
@@ -44,29 +44,29 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
 				$("#TB_overlay").click(tb_remove);
 			}
 		}
-		
+
 		if(tb_detectMacXFF()){
 			$("#TB_overlay").addClass("TB_overlayMacFFBGHack");//use png overlay so hide flash
 		}else{
 			$("#TB_overlay").addClass("TB_overlayBG");//use background and opacity
 		}
-		
+
 		if(caption===null){caption="";}
 		$("body").append("<div id='TB_load'><img src='"+imgLoader.src+"' /></div>");//add loader to the page
 		$('#TB_load').show();//show loader
-		
+
 		var baseURL;
 	   if(url.indexOf("?")!==-1){ //ff there is a query string involved
 			baseURL = url.substr(0, url.indexOf("?"));
-	   }else{ 
+	   }else{
 	   		baseURL = url;
 	   }
-	   
+
 	   var urlString = /\.jpg$|\.jpeg$|\.png$|\.gif$|\.bmp$/;
 	   var urlType = baseURL.toLowerCase().match(urlString);
 
 		if(urlType == '.jpg' || urlType == '.jpeg' || urlType == '.png' || urlType == '.gif' || urlType == '.bmp'){//code to show images
-				
+
 			TB_PrevCaption = "";
 			TB_PrevURL = "";
 			TB_PrevHTML = "";
@@ -79,7 +79,7 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
 				TB_TempArray = $("a[@rel="+imageGroup+"]").get();
 				for (TB_Counter = 0; ((TB_Counter < TB_TempArray.length) && (TB_NextHTML === "")); TB_Counter++) {
 					var urlTypeTemp = TB_TempArray[TB_Counter].href.toLowerCase().match(urlString);
-						if (!(TB_TempArray[TB_Counter].href == url)) {						
+						if (!(TB_TempArray[TB_Counter].href == url)) {
 							if (TB_FoundURL) {
 								TB_NextCaption = TB_TempArray[TB_Counter].title;
 								TB_NextURL = TB_TempArray[TB_Counter].href;
@@ -91,15 +91,15 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
 							}
 						} else {
 							TB_FoundURL = true;
-							TB_imageCount = "&nbsp;" + (TB_Counter + 1) +" of "+ (TB_TempArray.length);											
+							TB_imageCount = "&nbsp;" + (TB_Counter + 1) +" of "+ (TB_TempArray.length);
 						}
 				}
 			}
 
 			imgPreloader = new Image();
-			imgPreloader.onload = function(){		
+			imgPreloader.onload = function(){
 			imgPreloader.onload = null;
-				
+
 			// Resizing large images - orginal by Christian Montoya edited by me.
 			var pagesize = tb_getPageSize();
 			var x = pagesize[0] - 150;
@@ -107,51 +107,51 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
 			var imageWidth = imgPreloader.width;
 			var imageHeight = imgPreloader.height;
 			if (imageWidth > x) {
-				imageHeight = imageHeight * (x / imageWidth); 
-				imageWidth = x; 
-				if (imageHeight > y) { 
-					imageWidth = imageWidth * (y / imageHeight); 
-					imageHeight = y; 
+				imageHeight = imageHeight * (x / imageWidth);
+				imageWidth = x;
+				if (imageHeight > y) {
+					imageWidth = imageWidth * (y / imageHeight);
+					imageHeight = y;
 				}
-			} else if (imageHeight > y) { 
-				imageWidth = imageWidth * (y / imageHeight); 
-				imageHeight = y; 
-				if (imageWidth > x) { 
-					imageHeight = imageHeight * (x / imageWidth); 
+			} else if (imageHeight > y) {
+				imageWidth = imageWidth * (y / imageHeight);
+				imageHeight = y;
+				if (imageWidth > x) {
+					imageHeight = imageHeight * (x / imageWidth);
 					imageWidth = x;
 				}
 			}
 			// End Resizing
-			
+
 			TB_WIDTH = (imageWidth + 30 > 250?imageWidth + 30 :250);
-			TB_HEIGHT = imageHeight + 60;			
-			$("#TB_window").append("<a href='' id='TB_ImageOff' title='Close'><img id='TB_Image' src='"+url+"' width='"+imageWidth+"' height='"+imageHeight+"' alt='"+caption+"'/></a>" + "<div id='TB_caption'>"+caption+"<div id='TB_secondLine'>" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "</div></div><div id='TB_closeWindow'><a href='#' id='TB_closeWindowButton' title='Close'>" + thickbox.close +"</a></div>"); 		
-			
+			TB_HEIGHT = imageHeight + 60;
+			$("#TB_window").append("<a href='' id='TB_ImageOff' title='Close'><img id='TB_Image' src='"+url+"' width='"+imageWidth+"' height='"+imageHeight+"' alt='"+caption+"'/></a>" + "<div id='TB_caption'>"+caption+"<div id='TB_secondLine'>" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "</div></div><div id='TB_closeWindow'><a href='#' id='TB_closeWindowButton' title='Close'>" + thickbox.close +"</a></div>");
+
 			$("#TB_closeWindowButton").click(tb_remove);
-			
+
 			if (!(TB_PrevHTML === "")) {
 				function goPrev(){
 					if($(document).unbind("click",goPrev)){$(document).unbind("click",goPrev);}
 					$("#TB_window").remove();
 					$("body").append("<div id='TB_window'></div>");
 					tb_show(TB_PrevCaption, TB_PrevURL, imageGroup);
-					return false;	
+					return false;
 				}
 				$("#TB_prev").click(goPrev);
 			}
-			
-			if (!(TB_NextHTML === "")) {		
+
+			if (!(TB_NextHTML === "")) {
 				function goNext(){
 					$("#TB_window").remove();
 					$("body").append("<div id='TB_window'></div>");
-					tb_show(TB_NextCaption, TB_NextURL, imageGroup);				
-					return false;	
+					tb_show(TB_NextCaption, TB_NextURL, imageGroup);
+					return false;
 				}
 				$("#TB_next").click(goNext);
-				
+
 			}
 
-			document.onkeydown = function(e){ 	
+			document.onkeydown = function(e){
 				if (e == null) { // ie
 					keycode = event.keyCode;
 				} else { // mozilla
@@ -169,18 +169,18 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
 						document.onkeydown = "";
 						goPrev();
 					}
-				}	
+				}
 			};
-			
+
 			tb_position();
 			$("#TB_load").remove();
 			$("#TB_ImageOff").click(tb_remove);
 			$("#TB_window").css({display:"block"}); //for safari using css instead of show
 			};
-			
+
 			imgPreloader.src = url;
 		}else{//code to show html
-			
+
 			var queryString = url.replace(/^[^\?]+\??/,'');
 			var params = tb_parseQuery( queryString );
 
@@ -188,8 +188,8 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
 			TB_HEIGHT = (params['height']*1) + 40 || 440; //defaults to 440 if no paramaters were added to URL
 			ajaxContentW = TB_WIDTH - 30;
 			ajaxContentH = TB_HEIGHT - 45;
-			
-			if(url.indexOf('TB_iframe') != -1){// either iframe or ajax window		
+
+			if(url.indexOf('TB_iframe') != -1){// either iframe or ajax window
 					urlNoQuery = url.split('TB_');
 					$("#TB_iframeContent").remove();
 					if(params['modal'] != "true"){//iframe no modal
@@ -197,7 +197,7 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
 				   // START: ANDRE SILVA resolve pdf preview bug
 				   $("#TB_window").css({display:"block"}); //for safari using css instead of show
 				   // END: ANDRE SILVA resolve pdf preview bug
-						
+
 					}else{//iframe modal
 					$("#TB_overlay").unbind();
 						$("#TB_window").append("<iframe frameborder='0' hspace='0' src='"+urlNoQuery[0]+"' id='TB_iframeContent' name='TB_iframeContent"+Math.round(Math.random()*1000)+"' onload='tb_showIframe()' style='width:"+(ajaxContentW + 29)+"px;height:"+(ajaxContentH + 17)+"px;'> </iframe>");
@@ -208,7 +208,7 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
 						$("#TB_window").append("<div id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div id='TB_closeAjaxWindow'><a href='#' id='TB_closeWindowButton'>close</a> or Esc Key</div></div><div id='TB_ajaxContent' style='width:"+ajaxContentW+"px;height:"+ajaxContentH+"px'></div>");
 						}else{//ajax modal
 						$("#TB_overlay").unbind();
-						$("#TB_window").append("<div id='TB_ajaxContent' class='TB_modal' style='width:"+ajaxContentW+"px;height:"+ajaxContentH+"px;'></div>");	
+						$("#TB_window").append("<div id='TB_ajaxContent' class='TB_modal' style='width:"+ajaxContentW+"px;height:"+ajaxContentH+"px;'></div>");
 						}
 					}else{//this means the window is already up, we are just loading new content via ajax
 						$("#TB_ajaxContent")[0].style.width = ajaxContentW +"px";
@@ -217,17 +217,17 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
 						$("#TB_ajaxWindowTitle").html(caption);
 					}
 			}
-					
+
 			$("#TB_closeWindowButton").click(tb_remove);
-			
-				if(url.indexOf('TB_inline') != -1){	
+
+				if(url.indexOf('TB_inline') != -1){
 					$("#TB_ajaxContent").append($('#' + params['inlineId']).children());
 					$("#TB_window").unload(function () {
 						$('#' + params['inlineId']).append( $("#TB_ajaxContent").children() ); // move elements back when you're finished
 					});
 					tb_position();
 					$("#TB_load").remove();
-					$("#TB_window").css({display:"block"}); 
+					$("#TB_window").css({display:"block"});
 				}else if(url.indexOf('TB_iframe') != -1){
 					tb_position();
 					if($.browser.safari){//safari needs help because it will not fire iframe onload
@@ -242,11 +242,11 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
 						$("#TB_window").css({display:"block"});
 					});
 				}
-			
+
 		}
 
 		if(!params['modal']){
-			document.onkeyup = function(e){ 	
+			document.onkeyup = function(e){
 				if (e == null) { // ie
 					keycode = event.keyCode;
 				} else { // mozilla
@@ -254,10 +254,10 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
 				}
 				if(keycode == 27){ // close
 					tb_remove();
-				}	
+				}
 			};
 		}
-		
+
 	} catch(e) {
 		//nothing here
 	}

+ 4 - 4
main/inc/lib/fckeditor/editor/plugins/asciimath/fck_asciimath.js

@@ -269,15 +269,15 @@ function CheckBrowserCompatibility( show_message )
 		if ( FCKBrowserInfo.IsIE6 )
 		{
 			if ( IsMathPlayerInstalled() )
-			{       
+			{
 				var start = navigator.appVersion.indexOf( 'MathPlayer' ) ;
 				if ( start != -1 )
-				{ 
+				{
 					// The browser is Internet Explorer 6.0+ with properly set up plugin MathPalyer 2.
 					return true ;
 				}
 				else
-				{             
+				{
 					// Notify reader they need to upgrade to MathPlayer 2.
 					if ( show_message )
 					{
@@ -287,7 +287,7 @@ function CheckBrowserCompatibility( show_message )
 				}
 			}
 			else
-			{               
+			{
 				// Direct reader to MathPlayer page.
 				if ( show_message )
 				{

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio