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

copy Dialog starts in current directory 

Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de>
This commit is contained in:
Florian Schunk 2018-11-09 12:23:51 +01:00
parent 4e76b56497
commit 528964e0b7
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files/js/fileactions.js
View File

@ -655,7 +655,7 @@
if (type === OC.dialogs.FILEPICKER_TYPE_MOVE) { if (type === OC.dialogs.FILEPICKER_TYPE_MOVE) {
context.fileList.move(filename, targetPath, false, context.dir); context.fileList.move(filename, targetPath, false, context.dir);
} }
}, false, "httpd/unix-directory", true, actions); }, false, "httpd/unix-directory", true, actions, context.dir);
} }
}); });

13
core/js/oc-dialogs.js
View File

@ -189,8 +189,9 @@ var OCdialogs = {
* @param mimetypeFilter mimetype to filter by - directories will always be included * @param mimetypeFilter mimetype to filter by - directories will always be included
* @param modal make the dialog modal * @param modal make the dialog modal
* @param type Type of file picker : Choose, copy, move, copy and move * @param type Type of file picker : Choose, copy, move, copy and move
* @param path path to the folder that the the file can be picket from
*/ */
filepicker:function(title, callback, multiselect, mimetypeFilter, modal, type) { filepicker:function(title, callback, multiselect, mimetypeFilter, modal, type, path) {
var self = this; var self = this;
this.filepicker.sortField = 'name'; this.filepicker.sortField = 'name';
@ -214,6 +215,9 @@ var OCdialogs = {
this.filepicker.filesClient = (OCA.Sharing && OCA.Sharing.PublicApp && OCA.Sharing.PublicApp.fileList)? OCA.Sharing.PublicApp.fileList.filesClient: OC.Files.getClient(); this.filepicker.filesClient = (OCA.Sharing && OCA.Sharing.PublicApp && OCA.Sharing.PublicApp.fileList)? OCA.Sharing.PublicApp.fileList.filesClient: OC.Files.getClient();
this.filelist = null; this.filelist = null;
if (path == undefined) {
path = '';
}
$.when(this._getFilePickerTemplate()).then(function($tmpl) { $.when(this._getFilePickerTemplate()).then(function($tmpl) {
self.filepicker.loading = false; self.filepicker.loading = false;
@ -232,9 +236,14 @@ var OCdialogs = {
self.$filePicker = $tmpl.octemplate({ self.$filePicker = $tmpl.octemplate({
dialog_name: dialogName, dialog_name: dialogName,
title: title, title: title,
<<<<<<< HEAD
emptytext: emptyText, emptytext: emptyText,
newtext: newText newtext: newText
}).data('path', '').data('multiselect', multiselect).data('mimetype', mimetypeFilter); }).data('path', '').data('multiselect', multiselect).data('mimetype', mimetypeFilter);
=======
emptytext: emptyText
}).data('path', path).data('multiselect', multiselect).data('mimetype', mimetypeFilter);
>>>>>>> copy Dialog starts in current directory
if (modal === undefined) { if (modal === undefined) {
modal = false; modal = false;
@ -355,7 +364,7 @@ var OCdialogs = {
self.filepicker.sortOrder = self.filepicker.sortOrder === 'asc' ? 'desc' : 'asc'; self.filepicker.sortOrder = self.filepicker.sortOrder === 'asc' ? 'desc' : 'asc';
self._fillFilePicker(dir); self._fillFilePicker(dir);
}); });
self._fillFilePicker(''); self._fillFilePicker(path);
}); });
// build buttons // build buttons