From 5253343885e9c2d2d6afbdff4d8db8c49ec318f3 Mon Sep 17 00:00:00 2001 From: "John Molakvoæ (skjnldsv)" Date: Thu, 22 Mar 2018 15:31:18 +0100 Subject: Fixed files copy/move when in favorites or recent section MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/files/js/fileactions.js | 4 ++-- apps/files/js/filelist.js | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'apps/files') diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 2fb7dfba29f..9f3883bc8db 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -633,10 +633,10 @@ actionHandler: function (filename, context) { OC.dialogs.filepicker(t('files', 'Target folder'), function(targetPath, type) { if (type === OC.dialogs.FILEPICKER_TYPE_COPY) { - context.fileList.copy(filename, targetPath); + context.fileList.copy(filename, targetPath, false, context.dir); } if (type === OC.dialogs.FILEPICKER_TYPE_MOVE) { - context.fileList.move(filename, targetPath); + context.fileList.move(filename, targetPath, false, context.dir); } }, false, "httpd/unix-directory", true, OC.dialogs.FILEPICKER_TYPE_COPY_MOVE); } diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index e50b402dea8..1b924e0e22f 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -2035,10 +2035,12 @@ * @param fileNames array of file names to move * @param targetPath absolute target path * @param callback function to call when movement is finished + * @param dir the dir path where fileNames are located (optionnal, will take current folder if undefined) */ - move: function(fileNames, targetPath, callback) { + move: function(fileNames, targetPath, callback, dir) { var self = this; - var dir = this.getCurrentDirectory(); + + dir = typeof dir === 'string' ? dir : this.getCurrentDirectory(); if (dir.charAt(dir.length - 1) !== '/') { dir += '/'; } @@ -2098,13 +2100,14 @@ * @param fileNames array of file names to copy * @param targetPath absolute target path * @param callback to call when copy is finished with success + * @param dir the dir path where fileNames are located (optionnal, will take current folder if undefined) */ - copy: function(fileNames, targetPath, callback) { + copy: function(fileNames, targetPath, callback, dir) { var self = this; var filesToNotify = []; var count = 0; - var dir = this.getCurrentDirectory(); + dir = typeof dir === 'string' ? dir : this.getCurrentDirectory(); if (dir.charAt(dir.length - 1) !== '/') { dir += '/'; } -- cgit v1.2.3