During selection and unselection events, retrieve cached item data us…

…ing the original 'option' element as the cache lookup key instead of the event target
select2 · Jul 13, 2022 · 8258567 · 8258567
1 parent 9ce61fd
commit 8258567
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/dist/js/select2.full.js b/dist/js/select2.full.js
@@ -3403,11 +3403,15 @@ S2.define('select2/data/select',[
     this.container = container;
 
     container.on('select', function (params) {
-      self.select(params.data);
+      var option = container.$element.find('option')[0];
+      var data = Utils.GetData(option, 'data');
+      self.select(data);
     });
 
     container.on('unselect', function (params) {
-      self.unselect(params.data);
+      var option = container.$element.find('option')[0];
+      var data = Utils.GetData(option, 'data');
+      self.unselect(data);
     });
   };
 

diff --git a/dist/js/select2.js b/dist/js/select2.js
@@ -3403,11 +3403,15 @@ S2.define('select2/data/select',[
     this.container = container;
 
     container.on('select', function (params) {
-      self.select(params.data);
+      var option = container.$element.find('option')[0];
+      var data = Utils.GetData(option, 'data');
+      self.select(data);
     });
 
     container.on('unselect', function (params) {
-      self.unselect(params.data);
+      var option = container.$element.find('option')[0];
+      var data = Utils.GetData(option, 'data');
+      self.unselect(data);
     });
   };
 

diff --git a/src/js/select2/data/select.js b/src/js/select2/data/select.js
@@ -110,11 +110,15 @@ define([
     this.container = container;
 
     container.on('select', function (params) {
-      self.select(params.data);
+      var option = container.$element.find('option')[0];
+      var data = Utils.GetData(option, 'data');
+      self.select(data);
     });
 
     container.on('unselect', function (params) {
-      self.unselect(params.data);
+      var option = container.$element.find('option')[0];
+      var data = Utils.GetData(option, 'data');
+      self.unselect(data);
     });
   };