Fixup: unselection of items from AJAX data sources with non-string identifiers

src/js/select2/data/ajax.js

@@ -66,6 +66,9 @@ define([
 
     function request () {
       var $request = options.transport(options, function (data) {
+        if (data.results) {
+          data.results = data.results.map(AjaxAdapter.prototype._normalizeItem);
+        }
         var results = self.processResults(data, params);
 
         if (self.options.get('debug') && window.console && console.error) {

src/js/select2/data/select.js

@@ -70,10 +70,6 @@ define([
   SelectAdapter.prototype.unselect = function (data) {
     var self = this;
 
-    if (!this.$element.prop('multiple')) {
-      return;
-    }
-
     data.selected = false;
 
     if (

src/js/select2/results.js

@@ -455,12 +455,12 @@ define([
       var data = Utils.GetData(this, 'data');
 
       if ($this.hasClass('select2-results__option--selected')) {
-        if (self.options.get('multiple')) {
-          self.trigger('unselect', {
-            originalEvent: evt,
-            data: data
-          });
-        } else {
+        self.trigger('unselect', {
+          originalEvent: evt,
+          data: data
+        });
+
+        if (!self.options.get('multiple')) {
           self.trigger('close', {
             originalEvent: evt,
             data: data

tests/integration-jq1.html

@@ -10,6 +10,7 @@
 
     <script src="vendor/qunit-1.23.1.js" type="text/javascript"></script>
     <script src="vendor/jquery-1.12.4.js" type="text/javascript"></script>
+    <script src="vendor/jquery.mockjax-2.6.0.js" type="text/javascript"></script>
     <script src="../dist/js/select2.full.js" type="text/javascript"></script>
 
     <script src="helpers.js" type="text/javascript"></script>

tests/integration-jq2.html

@@ -10,6 +10,7 @@
 
     <script src="vendor/qunit-1.23.1.js" type="text/javascript"></script>
     <script src="vendor/jquery-2.2.4.js" type="text/javascript"></script>
+    <script src="vendor/jquery.mockjax-2.6.0.js" type="text/javascript"></script>
     <script src="../dist/js/select2.full.js" type="text/javascript"></script>
 
     <script src="helpers.js" type="text/javascript"></script>

tests/integration-jq3.html

@@ -10,6 +10,7 @@
 
     <script src="vendor/qunit-1.23.1.js" type="text/javascript"></script>
     <script src="vendor/jquery-3.4.1.js" type="text/javascript"></script>
+    <script src="vendor/jquery.mockjax-2.6.0.js" type="text/javascript"></script>
     <script src="../dist/js/select2.full.js" type="text/javascript"></script>
 
     <script src="helpers.js" type="text/javascript"></script>

tests/integration/select2-methods.js

@@ -137,3 +137,60 @@ test('multiple value matches the jquery value', function (assert) {
     'The values should match the jquery values'
   );
 });
+
+test('selection and clearing of data from ajax source', function (assert) {
+  var asyncDone = assert.async();
+
+  var dataURL = 'http://127.0.0.1/test';
+  $.mockjax({
+    url: dataURL,
+    responseText: {results: [{id: 6128, text: '6128'}]},
+    logging: 1
+  });
+
+  var $container = $('#qunit-fixture');
+  var $select = $('<select></select>');
+  $container.append($select);
+
+  var select = new Select2($select, {ajax: {url: dataURL}});
+
+  assert.equal(
+    $select.find(':selected').length,
+    0,
+    'No items should be selected'
+  );
+
+  // Open the dropdown menu, to perform an AJAX request
+  select.selection.trigger('query', {term: '6128'});
+
+  var selectionStatus = null;
+  select.on('results:all', function() {
+
+    // First call: select a result from the dropdown menu
+    if (selectionStatus === null) {
+
+      $('.select2-results__option').trigger('mouseup');
+      assert.equal(
+        $select.find(':selected').length,
+        1,
+        'One item should be selected'
+      );
+
+      // Trigger a second call
+      selectionStatus = true;
+      select.selection.trigger('query', {term: '6128'});
+
+    // Second call: unselect the previously-selected item
+    } else if (selectionStatus == true) {
+
+      $('.select2-results__option[aria-selected=true]').trigger('mouseup');
+      assert.equal(
+        $select.find(':selected').length,
+        0,
+        'The previously-selected item should have been unselected'
+      );
+
+      asyncDone();
+    }
+  });
+});