aboutsummaryrefslogtreecommitdiffstats
path: root/js/lib_files.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/lib_files.js')
-rw-r--r--js/lib_files.js13
1 files changed, 8 insertions, 5 deletions
diff --git a/js/lib_files.js b/js/lib_files.js
index f28a46d3a0a..47d1ac5f8a8 100644
--- a/js/lib_files.js
+++ b/js/lib_files.js
@@ -196,8 +196,8 @@ OC_FILES.rename_callback=function(req,file){
OC_FILES.browser.show(OC_FILES.dir);
}
-OC_FILES.remove=function(dir,file){
- remove=confirm('Delete file \''+file+'\'?');
+OC_FILES.remove=function(dir,file,force){
+ remove=force||confirm('Delete file \''+file+'\'?');
if(remove){
OC_API.run('delete',{dir:dir,file:file},OC_FILES.remove_callback,file)
OC_FILES.browser.files.remove(file);
@@ -309,9 +309,12 @@ OC_FILES.actions_selected.download=function(){
OC_FILES.actions_selected['delete']=function(){
files=OC_FILES.getSelected();
- for(index in files){
- OC_FILES.remove(OC_FILES.dir,files[index]);
- }
+ remove=confirm('Delete files \''+files.join('\', \'')+'\'?');
+ if(remove){
+ for(index in files){
+ OC_FILES.remove(OC_FILES.dir,files[index],true);
+ }
+ }
}
OC_FILES.files=Array();