diff options
Diffstat (limited to 'core/js/oc-dialogs.js')
| -rw-r--r-- | core/js/oc-dialogs.js | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 9646eb0cc41..3583019ef08 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -215,9 +215,7 @@ var OCdialogs = { this.filepicker.filesClient = (OCA.Sharing && OCA.Sharing.PublicApp && OCA.Sharing.PublicApp.fileList)? OCA.Sharing.PublicApp.fileList.filesClient: OC.Files.getClient(); this.filelist = null; - if (path == undefined) { - path = ''; - } + path = path || ''; $.when(this._getFilePickerTemplate()).then(function($tmpl) { self.filepicker.loading = false; @@ -236,14 +234,9 @@ var OCdialogs = { self.$filePicker = $tmpl.octemplate({ dialog_name: dialogName, title: title, -<<<<<<< HEAD emptytext: emptyText, newtext: newText - }).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) { modal = false; |