Skip to content

Dev/sarah/41859 task #10

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

Merged
SarahKhazma merged 2 commits into from
Mar 5, 2025
Merged

Dev/sarah/41859 task #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffa6d2a
41859 update select2 when there is a legend but no label
SarahKhazma Mar 3, 2025
8120431
41859 remove console logs
SarahKhazma Mar 3, 2025
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
34 changes: 21 additions & 13 deletions dist/js/select2.full.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1504,29 +1504,37 @@ S2.define('select2/selection/base',[
container.on('selection:update', function (params) {
self.update(params.data);
self.$selection.attr('aria-label', params.data.resultsId);
var $label = $('label[for="' + this.$element.attr('id') + '"]').text();
var $labeltext;
var label = $('label[for="' + this.$element.attr('id') + '"]').text();
var labeltext;
var legendtext;
if ($(this.$element).parents('.search-filter-group')){
legendtext= $(this.$element).parents('.search-filter-group')
.find('.search-filter-title').text();
}
var $rendered = self.$selection.find('.select2-selection__rendered');
var $title = $rendered.attr('title');
var title = $rendered.attr('title');
// this is here to prevent the aria-label breaking
// for the dropdown within the advanced search
// which currently has to be left enabled
// even if all other select2s are hidden
if ($title && $title == 'Click here to select criteria' )
{$title = undefined; }
if ($label && $title) {
$labeltext = $label + 'The selected value is:' + $title;
if (title && title == 'Click here to select criteria' )
{title = undefined; }
if (label && title) {
labeltext = label + ' The selected value is:' + title;
}
else if (label && !title) {
labeltext = label + 'No value currently selected.';
}
else if ($label && !$title) {
$labeltext = $label + 'No value currently selected.';
else if (legendtext) {
labeltext = 'Show more for category ' + legendtext;
}
else if ($title && !$label) {
$labeltext = 'The selected value is: ' + $title;
else if (title && !label) {
labeltext = 'The selected value is: ' + title;
}
else {
$labeltext = $label + 'No value currently selected.';
labeltext = label + 'No value currently selected.';
}
self.$selection.attr('aria-label', $labeltext);
self.$selection.attr('aria-label', labeltext);
});

container.on('open', function () {
Expand Down
2 changes: 1 addition & 1 deletion dist/js/select2.full.min.js
View file
Open in desktop

Large diffs are not rendered by default.

34 changes: 21 additions & 13 deletions dist/js/select2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1504,29 +1504,37 @@ S2.define('select2/selection/base',[
container.on('selection:update', function (params) {
self.update(params.data);
self.$selection.attr('aria-label', params.data.resultsId);
var $label = $('label[for="' + this.$element.attr('id') + '"]').text();
var $labeltext;
var label = $('label[for="' + this.$element.attr('id') + '"]').text();
var labeltext;
var legendtext;
if ($(this.$element).parents('.search-filter-group')){
legendtext= $(this.$element).parents('.search-filter-group')
.find('.search-filter-title').text();
}
var $rendered = self.$selection.find('.select2-selection__rendered');
var $title = $rendered.attr('title');
var title = $rendered.attr('title');
// this is here to prevent the aria-label breaking
// for the dropdown within the advanced search
// which currently has to be left enabled
// even if all other select2s are hidden
if ($title && $title == 'Click here to select criteria' )
{$title = undefined; }
if ($label && $title) {
$labeltext = $label + 'The selected value is:' + $title;
if (title && title == 'Click here to select criteria' )
{title = undefined; }
if (label && title) {
labeltext = label + ' The selected value is:' + title;
}
else if (label && !title) {
labeltext = label + 'No value currently selected.';
}
else if ($label && !$title) {
$labeltext = $label + 'No value currently selected.';
else if (legendtext) {
labeltext = 'Show more for category ' + legendtext;
}
else if ($title && !$label) {
$labeltext = 'The selected value is: ' + $title;
else if (title && !label) {
labeltext = 'The selected value is: ' + title;
}
else {
$labeltext = $label + 'No value currently selected.';
labeltext = label + 'No value currently selected.';
}
self.$selection.attr('aria-label', $labeltext);
self.$selection.attr('aria-label', labeltext);
});

container.on('open', function () {
Expand Down
2 changes: 1 addition & 1 deletion dist/js/select2.min.js
View file
Open in desktop

Large diffs are not rendered by default.

34 changes: 21 additions & 13 deletions src/js/select2/selection/base.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,29 +72,37 @@ define([
container.on('selection:update', function (params) {
self.update(params.data);
self.$selection.attr('aria-label', params.data.resultsId);
var $label = $('label[for="' + this.$element.attr('id') + '"]').text();
var $labeltext;
var label = $('label[for="' + this.$element.attr('id') + '"]').text();
var labeltext;
var legendtext;
if ($(this.$element).parents('.search-filter-group')){
legendtext= $(this.$element).parents('.search-filter-group')
.find('.search-filter-title').text();
}
var $rendered = self.$selection.find('.select2-selection__rendered');
var $title = $rendered.attr('title');
var title = $rendered.attr('title');
// this is here to prevent the aria-label breaking
// for the dropdown within the advanced search
// which currently has to be left enabled
// even if all other select2s are hidden
if ($title && $title == 'Click here to select criteria' )
{$title = undefined; }
if ($label && $title) {
$labeltext = $label + 'The selected value is:' + $title;
if (title && title == 'Click here to select criteria' )
{title = undefined; }
if (label && title) {
labeltext = label + ' The selected value is:' + title;
}
else if (label && !title) {
labeltext = label + 'No value currently selected.';
}
else if ($label && !$title) {
$labeltext = $label + 'No value currently selected.';
else if (legendtext) {
labeltext = 'Show more for category ' + legendtext;
}
else if ($title && !$label) {
$labeltext = 'The selected value is: ' + $title;
else if (title && !label) {
labeltext = 'The selected value is: ' + title;
}
else {
$labeltext = $label + 'No value currently selected.';
labeltext = label + 'No value currently selected.';
}
self.$selection.attr('aria-label', $labeltext);
self.$selection.attr('aria-label', labeltext);
});

container.on('open', function () {
Expand Down