aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/js
diff options
context:
space:
mode:
Diffstat (limited to 'apps/files/js')
-rw-r--r--apps/files/js/fileactions.js2
-rw-r--r--apps/files/js/filelist.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index de02bf5e730..04078d25706 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -255,7 +255,7 @@
this.register('all', 'Delete', OC.PERMISSION_DELETE, function () {
return OC.imagePath('core', 'actions/delete');
}, function (filename, context) {
- context.fileList.do_delete(filename);
+ context.fileList.do_delete(filename, context.dir);
$('.tipsy').remove();
});
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 4229988b171..c291c560589 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -1215,7 +1215,7 @@
$.ajax({
url: OC.filePath('files','ajax','rename.php'),
data: {
- dir : self.getCurrentDirectory(),
+ dir : tr.attr('data-path') || self.getCurrentDirectory(),
newname: newName,
file: oldname
},