wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3024 from owncloud/file-delete-action

Browse source 
Fix #1164 and fix showing spinner on delete
This commit is contained in:
Bart Visscher 2013-04-19 06:08:09 -07:00
commit 25e7dc1ec5
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/files/ajax/delete.php
View file

@ -8,7 +8,7 @@ OCP\JSON::callCheck();
// Get data
$dir = stripslashes($_POST["dir"]);
$files = isset($_POST["file"]) ? stripslashes($_POST["file"]) : stripslashes($_POST["files"]);
$files = isset($_POST["file"]) ? $_POST["file"] : $_POST["files"];
$files = json_decode($files);
$filesWithError = '';

6
apps/files/js/filelist.js
View file

@ -320,9 +320,9 @@ var FileList={
}
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 oldHTML = deleteAction.html();
var newHTML = '<img class="move2trash" data-action="Delete" title="'+t('files', 'perform delete operation')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>';
deleteAction[0].outerHTML = newHTML;
deleteAction.html(newHTML);
}
// Finish any existing actions
if (FileList.lastAction) {
@ -344,7 +344,7 @@ var FileList={
} else {
$.each(files,function(index,file) {
var deleteAction = $('tr').filterAttr('data-file',file).children("td.date").children(".move2trash");
deleteAction[0].outerHTML = oldHTML;
deleteAction.html(oldHTML);
});
}
});