Skip to content

Fix43788 removed aria haspopup on the control element #11053

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

Open
satyammangroliya wants to merge 9 commits into
base: release_10
Choose a base branch
from
+12 −12
Open

Fix43788 removed aria haspopup on the control element #11053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
48b9cb9
fix/43788-removed-aria-haspopup-on-the-control-element
satyammangroliya Feb 5, 2026
77f5902
Fix button formatting in tpl.viewcontrol_sortation.html
satyammangroliya Feb 5, 2026
b4acd38
Fix aria-haspopup attribute in ViewControlSortationTest
satyammangroliya Jun 5, 2026
5e4193f
Adjust sortation tests after removing aria-haspopup in SortationTest.php
satyammangroliya Jun 5, 2026
bf0f974
remove aria haspopup attributes in PanelTest
satyammangroliya Jun 5, 2026
2842ffc
remove aria haspopup attributes in test
satyammangroliya Jun 5, 2026
d14efe0
removed aria haspopup aria attributes in test
satyammangroliya Jun 5, 2026
ef19acf
revoked aria haspopup attributes for accessibility
satyammangroliya Jun 5, 2026
4652b69
Fix dropdown button aria attributes in test
satyammangroliya Jun 5, 2026
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
4 changes: 2 additions & 2 deletions components/ILIAS/UI/src/templates/default/Input/tpl.viewcontrol_sortation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="dropdown il-viewcontrol il-viewcontrol-sortation l-bar__element<!-- BEGIN disabled --> disabled<!-- END disabled -->"<!-- BEGIN id --> id="{ID}" <!-- END id -->>
<button class="btn btn-ctrl dropdown-toggle" type="button" data-toggle="dropdown"<!-- BEGIN aria_label --> aria-label="{ARIA_LABEL}"<!-- END aria_label --> aria-haspopup="true" aria-expanded="false" aria-controls="{ID_MENU}"><span class="glyphicon-sort"></span></button>
<button class="btn btn-ctrl dropdown-toggle" type="button" data-toggle="dropdown"<!-- BEGIN aria_label --> aria-label="{ARIA_LABEL}"<!-- END aria_label --> aria-expanded="false" aria-controls="{ID_MENU}"><span class="glyphicon-sort"></span></button>

<ul id="{ID_MENU}" class="dropdown-menu">
<!-- BEGIN option -->
Expand All @@ -10,4 +10,4 @@
<div class="il-viewcontrol-value" role="none">
{VALUES}
</div>
</div>
</div>
4 changes: 2 additions & 2 deletions components/ILIAS/UI/src/templates/default/ViewControl/tpl.sortation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<div class="dropdown il-viewcontrol il-viewcontrol-sortation l-bar__element" id="{ID}">
<button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown"<!-- BEGIN aria_label --> aria-label="{ARIA_LABEL}"<!-- END aria_label --> aria-haspopup="true" aria-expanded="false" aria-controls="{ID_MENU}"><span class="label">{LABEL}</span><span class="caret"></span></button>
<button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown"<!-- BEGIN aria_label --> aria-label="{ARIA_LABEL}"<!-- END aria_label --> aria-expanded="false" aria-controls="{ID_MENU}"><span class="label">{LABEL}</span><span class="caret"></span></button>

<ul id="{ID_MENU}" class="dropdown-menu">
<!-- BEGIN option -->
<li<!-- BEGIN selected --> class="selected"<!-- END selected -->>{OPTION}</li>
<!-- END option -->
</ul>
</div>
</div>
4 changes: 2 additions & 2 deletions components/ILIAS/UI/tests/Component/Input/ViewControl/ViewControlSortationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public function testViewControlFieldSortationRendering(): void

$expected = $this->brutallyTrimHTML('
<div class="dropdown il-viewcontrol il-viewcontrol-sortation l-bar__element" id="id_3">
<button class="btn btn-ctrl dropdown-toggle" type="button" data-toggle="dropdown" aria-label="label_sortation" aria-haspopup="true" aria-expanded="false" aria-controls="id_3_ctrl"><span class="glyphicon-sort"></span></button>
<button class="btn btn-ctrl dropdown-toggle" type="button" data-toggle="dropdown" aria-label="label_sortation" aria-expanded="false" aria-controls="id_3_ctrl"><span class="glyphicon-sort"></span></button>
<ul id="id_3_ctrl" class="dropdown-menu">
<li><button class="btn btn-link" id="id_1">A</button></li>
<li><button class="btn btn-link" id="id_2">B</button></li>
Expand Down Expand Up @@ -128,7 +128,7 @@ public function testViewControlFieldWithSignalsRendering(): void

$expected = $this->brutallyTrimHTML('
<div class="dropdown il-viewcontrol il-viewcontrol-sortation l-bar__element" id="id_3">
<button class="btn btn-ctrl dropdown-toggle" type="button" data-toggle="dropdown" aria-label="label_sortation" aria-haspopup="true" aria-expanded="false" aria-controls="id_3_ctrl"><span class="glyphicon-sort"></span></button>
<button class="btn btn-ctrl dropdown-toggle" type="button" data-toggle="dropdown" aria-label="label_sortation" aria-expanded="false" aria-controls="id_3_ctrl"><span class="glyphicon-sort"></span></button>
<ul id="id_3_ctrl" class="dropdown-menu">
<li><button class="btn btn-link" id="id_1">A</button></li>
<li><button class="btn btn-link" id="id_2">B</button></li>
Expand Down
2 changes: 1 addition & 1 deletion components/ILIAS/UI/tests/Component/Panel/PanelSecondaryLegacyTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ public function testRenderPanelSecondaryWithSortation(): void
<div class="panel-title"><h2>Title</h2></div>
<div class="panel-viewcontrols l-bar__space-keeper">
<div class="dropdown il-viewcontrol il-viewcontrol-sortation l-bar__element" id="id_1">
<button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-label="sortation" aria-haspopup="true" aria-expanded="false" aria-controls="id_1_ctrl">
<button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-label="sortation" aria-expanded="false" aria-controls="id_1_ctrl">
<span class="label">vc_sort B</span>
<span class="caret"></span>
</button>
Expand Down
2 changes: 1 addition & 1 deletion components/ILIAS/UI/tests/Component/Panel/PanelSecondaryListingTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ public function testRenderWithSortation(): void
<div class="panel-title"><h2>Title</h2></div>
<div class="panel-viewcontrols l-bar__space-keeper">
<div class="dropdown il-viewcontrol il-viewcontrol-sortation l-bar__element" id="id_1">
<button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-label="sortation" aria-haspopup="true" aria-expanded="false" aria-controls="id_1_ctrl">
<button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-label="sortation" aria-expanded="false" aria-controls="id_1_ctrl">
<span class="label">vc_sort A</span>
<span class="caret"></span>
</button>
Expand Down
2 changes: 1 addition & 1 deletion components/ILIAS/UI/tests/Component/Panel/PanelTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ public function testRenderWithSortation(): void
<div class="panel-title"><h2>Title</h2></div>
<div class="panel-viewcontrols l-bar__space-keeper">
<div class="dropdown il-viewcontrol il-viewcontrol-sortation l-bar__element" id="id_1">
<button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-label="sortation" aria-haspopup="true" aria-expanded="false" aria-controls="id_1_ctrl">
<button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-label="sortation" aria-expanded="false" aria-controls="id_1_ctrl">
<span class="label">vc_sort B</span>
<span class="caret"></span>
</button>
Expand Down
6 changes: 3 additions & 3 deletions components/ILIAS/UI/tests/Component/ViewControl/SortationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public function testRendering(): void

$expected = <<<EOT
<div class="dropdown il-viewcontrol il-viewcontrol-sortation l-bar__element" id="id_1">
<button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-label="sortation" aria-haspopup="true" aria-expanded="false" aria-controls="id_1_ctrl">
<button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-label="sortation" aria-expanded="false" aria-controls="id_1_ctrl">
<span class="label">vc_sort Most Recent</span>
<span class="caret"></span>
</button>
Expand All @@ -108,7 +108,7 @@ public function testRenderingWithSelected(): void

$expected = <<<EOT
<div class="dropdown il-viewcontrol il-viewcontrol-sortation l-bar__element" id="id_1">
<button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-label="sortation" aria-haspopup="true" aria-expanded="false" aria-controls="id_1_ctrl">
<button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-label="sortation" aria-expanded="false" aria-controls="id_1_ctrl">
<span class="label">vc_sort Most Recent</span>
<span class="caret"></span>
</button>
Expand Down Expand Up @@ -144,7 +144,7 @@ function ($id) {

$expected = <<<EOT
<div class="dropdown il-viewcontrol il-viewcontrol-sortation l-bar__element"$id>
<button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-label="sortation" aria-haspopup="true" aria-expanded="false" aria-controls="{$id_ctrl}">
<button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-label="sortation" aria-expanded="false" aria-controls="{$id_ctrl}">
<span class="label">vc_sort Best</span>
<span class="caret"></span>
</button>
Expand Down
Loading