diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2023-04-06 11:06:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-06 11:06:34 +0200 |
| commit | 6b4abd052235eaa5eac68fc0b2a578492fc57a15 (patch) | |
| tree | 32547c5f443ab9d0217f348b5af167fdf525c9b5 /core | |
| parent | 6fa55de28098db0f4ea8386cee10f2a3f2207745 (diff) | |
| parent | 52e66afed6b86c5d2233ca6144d12a826107a151 (diff) | |
| download | nextcloud-server-6b4abd052235eaa5eac68fc0b2a578492fc57a15.tar.gz nextcloud-server-6b4abd052235eaa5eac68fc0b2a578492fc57a15.zip | |
Merge pull request #37588 from nextcloud/bugfix/noid/filepicker-a11y
fix: Adjust filepicker breadcrumb structure to recent a11y changes
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/OC/dialogs.js | 12 | ||||
| -rw-r--r-- | core/templates/filepicker.html | 3 |
2 files changed, 10 insertions, 5 deletions
diff --git a/core/src/OC/dialogs.js b/core/src/OC/dialogs.js index 45e9e99049d..54d81171679 100644 --- a/core/src/OC/dialogs.js +++ b/core/src/OC/dialogs.js @@ -1290,11 +1290,13 @@ const Dialogs = { this.$dirTree.empty() var self = this + self.$dirTree.append('<nav></nav>') self.$dirTree.append(addButton) var dir var path = this.$filePicker.data('path') - var $template = $('<div data-dir="{dir}" tabindex="0"><a>{name}</a></div>').addClass('crumb') + var $template = $('<li data-dir="{dir}" tabindex="0"><a class="{classList}">{name}</a></li>').addClass('crumb') + var $breadcrumbs = $('<ul class="breadcrumb"></ul>') if (path) { var paths = path.split('/') $.each(paths, function(index, dir) { @@ -1302,18 +1304,20 @@ const Dialogs = { if (dir === '') { return false } - self.$dirTree.prepend($template.octemplate({ + $breadcrumbs.append($template.octemplate({ dir: paths.join('/') + '/' + dir, name: dir })) }) } - $template.octemplate({ dir: '', name: t('core', 'Home'), - }, { escapeFunction: null }).prependTo(this.$dirTree) + classList: 'icon-home' + }, { escapeFunction: null }).addClass('crumb svg crumbhome').prependTo($breadcrumbs) + + this.$dirTree.find('nav').prepend($breadcrumbs) }, /** * handle selection made in the tree list diff --git a/core/templates/filepicker.html b/core/templates/filepicker.html index 484a6e12d2b..21ac2856d34 100644 --- a/core/templates/filepicker.html +++ b/core/templates/filepicker.html @@ -1,5 +1,6 @@ <div id="{dialog_name}" title="{title}"> - <span class="dirtree breadcrumb"> + <span class="dirtree"> + <nav></nav> <span class="actions creatable"><a href="#" class="icon icon-add button button-add" aria-label="{newtext}"></a> <nav class="menu popovermenu bubble menu-left newFolderMenu"> <ul><li> |