diff --git a/app/views/file/_create_folder.rjs b/app/views/file/_create_folder.rjs index 932233af..2c8814d1 100644 --- a/app/views/file/_create_folder.rjs +++ b/app/views/file/_create_folder.rjs @@ -6,5 +6,5 @@ page << 'FileEditor.showDetails();' page << "setTimeout('FileEditor.refreshUploadedFolder(#{@folder.id},#{@parent_id})',10);" page << "FileEditor.recreateDragAndDroppables();" - +page << "FileEditor.highlightTreeFolder(#{@folder.id});" page << "setTimeout('FileEditor.nameChange(#{@folder.id});',20); " diff --git a/app/views/file/_file_javascript.rhtml b/app/views/file/_file_javascript.rhtml index a6508a4a..361144df 100644 --- a/app/views/file/_file_javascript.rhtml +++ b/app/views/file/_file_javascript.rhtml @@ -703,9 +703,9 @@ FileEditor = { - deleteSelected: function() { + deleteSelected: function(file_ids) { if(confirm('<%= jh "Are you sure you want to delete the selected item(s)?" %>')) { - var itms = FileEditor.selectedItems; + var itms = file_ids ? file_ids : FileEditor.selectedItems; var req = $H({ 'file_id[]' : itms }); new Ajax.Request('<%= url_for :controller => "file", :action => "delete_files" %>', { parameters : req.toQueryString() + FileEditor.sizeParameters(), diff --git a/app/views/file/details/_folder_details.rhtml b/app/views/file/details/_folder_details.rhtml index aa3169d8..90f9444d 100644 --- a/app/views/file/details/_folder_details.rhtml +++ b/app/views/file/details/_folder_details.rhtml @@ -6,10 +6,8 @@ <% if file.file_type_match(@select) -%> <% end -%> - <% if !defined?(folder_just_loaded) || folder_just_loaded != true -%> - <% end -%>