From 2b572f676d8fe939354dda4f068a0e8ba78663b5 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Sat, 27 Aug 2011 19:32:48 -0400
Subject: [PATCH] Fix file actions broken in some browsers, rename delete to
 do_delete - Thanks Bart Visscher

---
 files/js/fileactions.js | 2 +-
 files/js/filelist.js    | 4 ++--
 files/js/files.js       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/files/js/fileactions.js b/files/js/fileactions.js
index 04943abf74a..4ff8562fef3 100644
--- a/files/js/fileactions.js
+++ b/files/js/fileactions.js
@@ -129,7 +129,7 @@ FileActions.register('all','Download',function(){return OC.imagePath('core','act
 });
 
 FileActions.register('all','Delete',function(){return OC.imagePath('core','actions/delete')},function(filename){
-	FileList.delete(filename);
+	FileList.do_delete(filename);
 });
 
 FileActions.register('all','Rename',function(){return OC.imagePath('core','actions/rename')},function(filename){
diff --git a/files/js/filelist.js b/files/js/filelist.js
index a776b7bce08..a5b8854e929 100644
--- a/files/js/filelist.js
+++ b/files/js/filelist.js
@@ -150,10 +150,10 @@ FileList={
 			form.trigger('submit');
 		});
 	},
-	delete:function(files){
+	do_delete:function(files){
 		if(FileList.deleteFiles){//finish any ongoing deletes first
 			FileList.finishDelete(function(){
-				FileList.delete(files);
+				FileList.do_delete(files);
 			});
 			return;
 		}
diff --git a/files/js/files.js b/files/js/files.js
index baf8debf48b..9829789fe08 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -100,7 +100,7 @@ $(document).ready(function() {
 	$('.delete').click(function(event) {
 		var files=getSelectedFiles('name');
 		event.preventDefault();
-		FileList.delete(files);
+		FileList.do_delete(files);
 		return false;
 	});