diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2016-10-25 08:22:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-25 08:22:59 +0200 |
| commit | 1ff328ae659de1d222030d04797442aa7a343a1d (patch) | |
| tree | 5617d60ab73b4e83a64f93e37ed3ef2298d054c4 /core | |
| parent | 60fa82d92fe6ac911a8b45350c74dd0bde4490f8 (diff) | |
| parent | fb9e500698f2439986c143a474a76605a35d59f0 (diff) | |
| download | nextcloud-server-1ff328ae659de1d222030d04797442aa7a343a1d.tar.gz nextcloud-server-1ff328ae659de1d222030d04797442aa7a343a1d.zip | |
Merge pull request #1823 from nextcloud/filepicker-folder-fix
Fix picking a folder with the filepicker
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/oc-dialogs.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 5cf45fe0fb9..5a5bdc33d5d 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -194,7 +194,10 @@ var OCdialogs = { }); } else { datapath = self.$filePicker.data('path'); - datapath += '/' + self.$filelist.find('tr.filepicker_element_selected').data('entryname'); + var selectedName = self.$filelist.find('tr.filepicker_element_selected').data('entryname'); + if (selectedName) { + datapath += '/' + selectedName; + } } callback(datapath); self.$filePicker.ocdialog('close'); |