Browse Source

Selected property of the element, not object

Slight revision to the changes made in
9d359c9b385da0c068afa7568d602a8c2c692b9a.
Kevin Brown 10 years ago
parent
commit
54154c3df6

+ 2 - 2
dist/js/select2.full.js

@@ -828,8 +828,8 @@ S2.define('select2/results',[
         // id needs to be converted to a string when comparing
         var id = '' + item.id;
 
-        if (item.selected ||
-            (item.selected == null && $.inArray(id, selectedIds) > -1)) {
+        if ((item.element != null && item.element.selected) ||
+            (item.element == null && $.inArray(id, selectedIds) > -1)) {
           $option.attr('aria-selected', 'true');
         } else {
           $option.attr('aria-selected', 'false');

File diff suppressed because it is too large
+ 0 - 0
dist/js/select2.full.min.js


+ 2 - 2
dist/js/select2.js

@@ -828,8 +828,8 @@ S2.define('select2/results',[
         // id needs to be converted to a string when comparing
         var id = '' + item.id;
 
-        if (item.selected ||
-            (item.selected == null && $.inArray(id, selectedIds) > -1)) {
+        if ((item.element != null && item.element.selected) ||
+            (item.element == null && $.inArray(id, selectedIds) > -1)) {
           $option.attr('aria-selected', 'true');
         } else {
           $option.attr('aria-selected', 'false');

File diff suppressed because it is too large
+ 0 - 0
dist/js/select2.min.js


+ 2 - 2
src/js/select2/results.js

@@ -109,8 +109,8 @@ define([
         // id needs to be converted to a string when comparing
         var id = '' + item.id;
 
-        if (item.selected ||
-            (item.selected == null && $.inArray(id, selectedIds) > -1)) {
+        if ((item.element != null && item.element.selected) ||
+            (item.element == null && $.inArray(id, selectedIds) > -1)) {
           $option.attr('aria-selected', 'true');
         } else {
           $option.attr('aria-selected', 'false');

Some files were not shown because too many files changed in this diff