execute lastAction() before add new one
This commit is contained in:
parent
842cd57fa7
commit
1e880feab1
|
@ -255,20 +255,23 @@ var 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) {
|
||||||
if(!FileList.deleteFiles) {
|
|
||||||
FileList.prepareDeletion(files);
|
|
||||||
}
|
|
||||||
FileList.lastAction();
|
FileList.lastAction();
|
||||||
}
|
}
|
||||||
|
|
||||||
FileList.prepareDeletion(files);
|
FileList.prepareDeletion(files);
|
||||||
// NOTE: Temporary fix to change the text to unshared for files in root of Shared folder
|
|
||||||
if ($('#dir').val() == '/Shared') {
|
if (!FileList.useUndo) {
|
||||||
$('#notification').html(t('files', 'unshared')+' '+files+'<span class="undo">'+t('files', 'undo')+'</span>');
|
FileList.lastAction();
|
||||||
} else {
|
} else {
|
||||||
$('#notification').html(t('files', 'deleted')+' '+files+'<span class="undo">'+t('files', 'undo')+'</span>');
|
// NOTE: Temporary fix to change the text to unshared for files in root of Shared folder
|
||||||
|
if ($('#dir').val() == '/Shared') {
|
||||||
|
$('#notification').html(t('files', 'unshared')+' '+files+'<span class="undo">'+t('files', 'undo')+'</span>');
|
||||||
|
} else {
|
||||||
|
$('#notification').html(t('files', 'deleted')+' '+files+'<span class="undo">'+t('files', 'undo')+'</span>');
|
||||||
|
}
|
||||||
|
$('#notification').fadeIn();
|
||||||
}
|
}
|
||||||
$('#notification').fadeIn();
|
|
||||||
},
|
},
|
||||||
finishDelete:function(ready,sync){
|
finishDelete:function(ready,sync){
|
||||||
if(!FileList.deleteCanceled && FileList.deleteFiles){
|
if(!FileList.deleteCanceled && FileList.deleteFiles){
|
||||||
|
|
Loading…
Reference in New Issue