From c40c89999d4e7b73f0e9a1aab222b6c781370345 Mon Sep 17 00:00:00 2001 From: Ivan Tcholakov Date: Tue, 3 Feb 2009 13:35:14 +0100 Subject: [PATCH] [svn r18191] FS#2867 - FCKEditor, simple file manager: A logical improvement of the listed items in the resource selector box. --- .../filemanager/browser/default/browser.html | 9 +++---- .../browser/default/frmresourcetype.html | 25 +++++++++++-------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/main/inc/lib/fckeditor/editor/filemanager/browser/default/browser.html b/main/inc/lib/fckeditor/editor/filemanager/browser/default/browser.html index 370af736da..6663b1fbc3 100644 --- a/main/inc/lib/fckeditor/editor/filemanager/browser/default/browser.html +++ b/main/inc/lib/fckeditor/editor/filemanager/browser/default/browser.html @@ -90,13 +90,10 @@ if ( sServerPath.length > 0 ) oConnector.ResourceType = GetUrlParam( 'Type' ) ; -// Modified by Ivan Tcholakov. -//oConnector.ShowAllTypes = ( oConnector.ResourceType.length == 0 ) ; -oConnector.ShowAllTypes = true ; +oConnector.ShowAllTypes = ( oConnector.ResourceType.length == 0 ) ; -// Disabled by Ivan Tcholakov. -//if ( oConnector.ShowAllTypes ) -// oConnector.ResourceType = 'File' ; +if ( oConnector.ShowAllTypes ) + oConnector.ResourceType = 'File' ; oConnector.SendCommand = function( command, params, callBackFunction ) { diff --git a/main/inc/lib/fckeditor/editor/filemanager/browser/default/frmresourcetype.html b/main/inc/lib/fckeditor/editor/filemanager/browser/default/frmresourcetype.html index da5b69e7ce..2fdfc717b7 100644 --- a/main/inc/lib/fckeditor/editor/filemanager/browser/default/frmresourcetype.html +++ b/main/inc/lib/fckeditor/editor/filemanager/browser/default/frmresourcetype.html @@ -36,10 +36,8 @@ function SetResourceType( type ) var aTypes = [ - // Modified by Ivan Tcholakov. - //['File','File'], ['File','All files'], - + ['Audio','Audio'], ['Images','Images'], ['Flash','Flash'], ['Video','Video'], @@ -50,20 +48,25 @@ window.onload = function() { var oCombo = document.getElementById('cmbType') ; oCombo.innerHTML = '' ; - for ( var i = 0 ; i < aTypes.length ; i++ ) + if ( oConnector.ShowAllTypes ) { - if ( oConnector.ShowAllTypes || aTypes[i][0] == oConnector.ResourceType ) + AddSelectOption( oCombo, aTypes[0][1], aTypes[0][0], true ) ; + + for ( var i = 1 ; i < aTypes.length ; i++ ) + { + AddSelectOption( oCombo, aTypes[i][1], aTypes[i][0] ) ; + } + } + else + { + AddSelectOption( oCombo, aTypes[0][1], aTypes[0][0] ) ; + + for ( var i = 1 ; i < aTypes.length ; i++ ) { - // Modified by Ivan Tcholakov. - //AddSelectOption( oCombo, aTypes[i][1], aTypes[i][0] ) ; if ( aTypes[i][0] == oConnector.ResourceType ) { AddSelectOption( oCombo, aTypes[i][1], aTypes[i][0], true ) ; } - else - { - AddSelectOption( oCombo, aTypes[i][1], aTypes[i][0] ) ; - } } } }