Skip to content

Commit 54154c3

Browse files
committed
Selected property of the element, not object
Slight revision to the changes made in 9d359c9.
1 parent 0c573df commit 54154c3

5 files changed

Lines changed: 8 additions & 8 deletions

File tree

dist/js/select2.full.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -828,8 +828,8 @@ S2.define('select2/results',[
828828
// id needs to be converted to a string when comparing
829829
var id = '' + item.id;
830830

831-
if (item.selected ||
832-
(item.selected == null && $.inArray(id, selectedIds) > -1)) {
831+
if ((item.element != null && item.element.selected) ||
832+
(item.element == null && $.inArray(id, selectedIds) > -1)) {
833833
$option.attr('aria-selected', 'true');
834834
} else {
835835
$option.attr('aria-selected', 'false');

dist/js/select2.full.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/js/select2.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -828,8 +828,8 @@ S2.define('select2/results',[
828828
// id needs to be converted to a string when comparing
829829
var id = '' + item.id;
830830

831-
if (item.selected ||
832-
(item.selected == null && $.inArray(id, selectedIds) > -1)) {
831+
if ((item.element != null && item.element.selected) ||
832+
(item.element == null && $.inArray(id, selectedIds) > -1)) {
833833
$option.attr('aria-selected', 'true');
834834
} else {
835835
$option.attr('aria-selected', 'false');

dist/js/select2.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/js/select2/results.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ define([
109109
// id needs to be converted to a string when comparing
110110
var id = '' + item.id;
111111

112-
if (item.selected ||
113-
(item.selected == null && $.inArray(id, selectedIds) > -1)) {
112+
if ((item.element != null && item.element.selected) ||
113+
(item.element == null && $.inArray(id, selectedIds) > -1)) {
114114
$option.attr('aria-selected', 'true');
115115
} else {
116116
$option.attr('aria-selected', 'false');

0 commit comments

Comments
 (0)