mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix deletion for browser that do not support onBeforeUnload, fixes oc-1534.

This commit is contained in:
Arthur Schiwon 2012-08-20 17:24:10 +02:00
parent cb0464ca4e
commit ef3eebfd3e
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
apps/files/js/filelist.js
View File

@ -151,7 +151,7 @@ FileList={
} }
}); });
} }
} }
tr.attr('data-file', newname); tr.attr('data-file', newname);
var path = td.children('a.name').attr('href'); var path = td.children('a.name').attr('href');
@ -189,7 +189,7 @@ FileList={
FileList.replaceCanceled = false; FileList.replaceCanceled = false;
FileList.replaceOldName = oldName; FileList.replaceOldName = oldName;
FileList.replaceNewName = newName; FileList.replaceNewName = newName;
FileList.lastAction = function() { FileList.lastAction = function() {
FileList.finishReplace(); FileList.finishReplace();
}; };
$('#notification').html(t('files', 'replaced')+' '+newName+' '+t('files', 'with')+' '+oldName+'<span class="undo">'+t('files', 'undo')+'</span>'); $('#notification').html(t('files', 'replaced')+' '+newName+' '+t('files', 'with')+' '+oldName+'<span class="undo">'+t('files', 'undo')+'</span>');
@ -236,23 +236,13 @@ FileList={
do_delete:function(files){ do_delete:function(files){
// Finish any existing actions // Finish any existing actions
if (FileList.lastAction || !FileList.useUndo) { if (FileList.lastAction || !FileList.useUndo) {
if(!FileList.deleteFiles) {
FileList.prepareDeletion(files);
}
FileList.lastAction(); FileList.lastAction();
return;
} }
if(files.substr){ FileList.prepareDeletion(files);
files=[files];
}
$.each(files,function(index,file){
var files = $('tr').filterAttr('data-file',file);
files.hide();
files.find('input[type="checkbox"]').removeAttr('checked');
files.removeClass('selected');
});
procesSelection();
FileList.deleteCanceled=false;
FileList.deleteFiles=files;
FileList.lastAction = function() {
FileList.finishDelete(null, true);
};
$('#notification').html(t('files', 'deleted')+' '+files+'<span class="undo">'+t('files', 'undo')+'</span>'); $('#notification').html(t('files', 'deleted')+' '+files+'<span class="undo">'+t('files', 'undo')+'</span>');
$('#notification').fadeIn(); $('#notification').fadeIn();
}, },
@ -279,6 +269,23 @@ FileList={
} }
}); });
} }
},
prepareDeletion:function(files){
if(files.substr){
files=[files];
}
$.each(files,function(index,file){
var files = $('tr').filterAttr('data-file',file);
files.hide();
files.find('input[type="checkbox"]').removeAttr('checked');
files.removeClass('selected');
});
procesSelection();
FileList.deleteCanceled=false;
FileList.deleteFiles=files;
FileList.lastAction = function() {
FileList.finishDelete(null, true);
};
} }
} }