Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Backport stable-16.4.x] XWIKI-22523: Hitting the Enter key in fields on XWiki pages opens the hamburger content menu #3678

Merged
merged 1 commit into from
Nov 22, 2024
Merged

[Backport stable-16.4.x] XWIKI-22523: Hitting the Enter key in fields on XWiki pages opens the hamburger content menu #3678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/menus_content.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
*#
#macro(displayMenu $id $icon $menuContent $titleKey $titleAsLabel $actionUrl $extraAttribute)
<div class="btn-group" id="$id">
<#if ("$!actionUrl" == '')button#{else}a#end class="btn btn-default#if ("$!actionUrl" == '') dropdown-toggle#end" title="$services.localization.render($titleKey)"##
<#if ("$!actionUrl" == '')button type="button"#{else}a#end class="btn btn-default#if ("$!actionUrl" == '') dropdown-toggle#end" title="$services.localization.render($titleKey)"##
#if ("$!actionUrl" != '')
href="$actionUrl"
#else
Expand Down
5 changes: 3 additions & 2 deletions ...latform-web/xwiki-platform-web-templates/src/main/resources/templates/hierarchy_macros.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,9 +227,10 @@
## If the rootId is null, this means that the root is the home. Which means that we're on the first tree, which doesn't show exactly the same thing as the others.
#set ($togglerTextAlternative = "<span class='sr-only'>$escapetool.xml($services.localization.render('web.hierarchy.toggler.label.parents', [$pathData.get($openToIndex).label])) </span>")
#end
#set ($treeToggle = "<button class='dropdown-toggle' data-toggle='dropdown'>" +
#set ($treeToggle = "<button class='dropdown-toggle' type='button' data-toggle='dropdown'>" +
$togglerTextAlternative +
"$services.icon.renderHTML('caret-down')</button>")
$services.icon.renderHTML('caret-down') +
"</button>")
#set ($treeNavigation = "$treeToggle<div class='dropdown-menu'>#documentTree($treeParams)</div>")
#end
#end
Expand Down
Loading