aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/js/filelist.js
diff options
context:
space:
mode:
authorThomas Mueller <thomas.mueller@tmit.eu>2013-02-22 22:59:09 +0100
committerThomas Mueller <thomas.mueller@tmit.eu>2013-02-22 22:59:09 +0100
commit9898ba4daf1acdead2ed5fa6024e779caafb353e (patch)
tree3fc02fea4997344c73e0bc5ac7bdfc5616d7a7df /apps/files/js/filelist.js
parent5062ae250b767867609f64c29ab4cde65f022b75 (diff)
parent78fce834058a38a7dbcc5310e16095c743434bc6 (diff)
downloadnextcloud-server-9898ba4daf1acdead2ed5fa6024e779caafb353e.tar.gz
nextcloud-server-9898ba4daf1acdead2ed5fa6024e779caafb353e.zip
Merge branch 'master' into master-sqlserver
Conflicts: core/templates/installation.php
Diffstat (limited to 'apps/files/js/filelist.js')
-rw-r--r--apps/files/js/filelist.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index cc107656da8..0bf1f79ab77 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -315,8 +315,8 @@ var FileList={
do_delete:function(files){
if(files.substr){
files=[files];
- }
- for (var i in files) {
+ }
+ for (var i=0; i<files.length; i++) {
var deleteAction = $('tr').filterAttr('data-file',files[i]).children("td.date").children(".action.delete");
var oldHTML = deleteAction[0].outerHTML;
var newHTML = '<img class="move2trash" data-action="Delete" title="'+t('files', 'perform delete operation')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>';