Minor style code changes

skala
Julio Montoya 14 years ago
parent e4a4c49c91
commit bf59585d98
  1. 19
      main/inc/lib/fckeditor/editor/dialog/fck_image/fck_image.js
  2. 7
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/ajaxfilemanager.js
  3. 6
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/for_fckeditor.js
  4. 7
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/for_form.js
  5. 3
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/jscripts/for_tinymce.js

@ -33,13 +33,13 @@ var FCKTools = oEditor.FCKTools ;
window.document.dir = FCKLang.Dir ;
// 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['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 ' ;
FCKLang['InvalidFileType'] = FCKLang['InvalidFileType'] ? FCKLang['InvalidFileType'] : 'Invalid file type.' ;
FCKLang['SecurityError'] = FCKLang['SecurityError'] ? FCKLang['SecurityError'] : 'Security error. You probably don\'t have enough permissions to upload. Please check your server.' ;
FCKLang['ConnectorDisabled'] = FCKLang['ConnectorDisabled'] ? FCKLang['ConnectorDisabled'] : 'The upload feature (connector) is disabled.' ;
FCKLang['UploadError'] = FCKLang['UploadError'] ? FCKLang['UploadError'] : 'Error on file upload. Error number: ' ;
FCKLang['FileRenamed'] = FCKLang['FileRenamed'] ? FCKLang['FileRenamed'] : 'A file with the same name is already available. The uploaded file has been renamed to ' ;
FCKLang['InvalidFileType'] = FCKLang['InvalidFileType'] ? FCKLang['InvalidFileType'] : 'Invalid file type.' ;
FCKLang['SecurityError'] = FCKLang['SecurityError'] ? FCKLang['SecurityError'] : 'Security error. You probably don\'t have enough permissions to upload. Please check your server.' ;
FCKLang['ConnectorDisabled'] = FCKLang['ConnectorDisabled'] ? FCKLang['ConnectorDisabled'] : 'The upload feature (connector) is disabled.' ;
FCKLang['UploadError'] = FCKLang['UploadError'] ? FCKLang['UploadError'] : 'Error on file upload. Error number: ' ;
var bImageButton = ( document.location.search.length > 0 && document.location.search.substr(1) == 'ImageButton' ) ;
@ -77,13 +77,10 @@ var oLink = dialog.Selection.GetSelection().MoveToAncestorNode( 'A' ) ;
var oImageOriginal ;
function UpdateOriginal( resetSize )
{
function UpdateOriginal( resetSize ) {
if ( !eImgPreview )
return ;
if ( GetE('txtUrl').value.length == 0 )
{
if ( GetE('txtUrl').value.length == 0 ) {
oImageOriginal = null ;
return ;
}

@ -134,9 +134,7 @@ $(elem).each(
}
if(typeof(selectFile) != 'undefined')
{
if(typeof(selectFile) != 'undefined') {
selectFile(files[num].url);
}else
generateDownloadIframe(appendQueryString(getUrl('download'), 'path=' + files[num].path, ['path'])); {
@ -1732,8 +1730,9 @@ function setDocInfo(type, num) {
$('#fileFieldSet').css('display', '');
if (typeof(selectFile) != 'undefined' && $('#fileList input[@type=checkbox][@checked]').length==1 || $('#rightCol dl.thumbnailListing input[@type=checkbox][@checked]').length==1 ) {
$('#selectCurrentUrl').unbind('click').click(function() {
$('#selectCurrentUrl').unbind('click').click(function() {
selectFile(info.url);
}
);
$('#returnCurrentUrl').show();

@ -1,8 +1,8 @@
// The function below has added by logan (cailongqun [at] yahoo [dot] com [dot] cn) from www.phpletter.com
// Modifications by Juan Carlos Raña Trabado and Ivan Tcholakov, 2009
// Modifications by Juan Carlos Ra<EFBFBD>a Trabado and Ivan Tcholakov, 2009
function selectFile(url) {
var selectedFileRowNum = $('#selectedFileRowNum').val();
function selectFile(url) {
var selectedFileRowNum = $('#selectedFileRowNum').val();
if(selectedFileRowNum != '' && $('#row' + selectedFileRowNum)) {
if ( window.opener ) {
// The advanced file manager has been opened in a new window.

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

@ -222,8 +222,7 @@ tinyMCEPopup.init();
//tinyMCEPopup.requireLangPack();
function selectFile(url)
{
function selectFile(url) {
if(typeof(url) != 'undefined')
{

Loading…
Cancel
Save