Results respect disabled state of <option>

src/js/select2/results.js

@@ -175,7 +175,12 @@ define([
       'aria-selected': 'false'
     };
 
-    if (data.disabled) {
+    var matches = window.Element.prototype.matches ||
+      window.Element.prototype.msMatchesSelector ||
+      window.Element.prototype.webkitMatchesSelector;
+
+    if ((data.element != null && matches.call(data.element, ':disabled')) ||
+        (data.element == null && data.disabled)) {
       delete attrs['aria-selected'];
       attrs['aria-disabled'] = 'true';
     }

tests/results/option-tests.js

@@ -0,0 +1,63 @@
+module('Results - option');
+
+var $ = require('jquery');
+
+var Options = require('select2/options');
+
+var Results = require('select2/results');
+
+test('disabled property on option is respected - enabled', function (assert) {
+  var results = new Results($('<select></select>'), new Options({}));
+
+  var $option = $('<option></option>');
+  var option = results.option({
+    element: $option[0]
+  });
+
+  assert.notEqual(option.getAttribute('aria-disabled'), 'true');
+});
+
+test('disabled property on option is respected - disabled', function (assert) {
+  var results = new Results($('<select></select>'), new Options({}));
+
+  var $option = $('<option disabled></option>');
+  var option = results.option({
+    element: $option[0]
+  });
+
+  assert.equal(option.getAttribute('aria-disabled'), 'true');
+});
+
+test('disabled property on enabled optgroup is respected', function (assert) {
+  var results = new Results($('<select></select>'), new Options({}));
+
+  var $option = $('<optgroup></optgroup>');
+  var option = results.option({
+    element: $option[0]
+  });
+
+  assert.notEqual(option.getAttribute('aria-disabled'), 'true');
+});
+
+test('disabled property on disabled optgroup is respected', function (assert) {
+  var results = new Results($('<select></select>'), new Options({}));
+
+  var $option = $('<optgroup disabled></optgroup>');
+  var option = results.option({
+    element: $option[0]
+  });
+
+  assert.equal(option.getAttribute('aria-disabled'), 'true');
+});
+
+test('option in disabled optgroup is disabled', function (assert) {
+  var results = new Results($('<select></select>'), new Options({}));
+
+  var $option = $('<optgroup disabled><option></option></optgroup>')
+    .find('option');
+  var option = results.option({
+    element: $option[0]
+  });
+
+  assert.equal(option.getAttribute('aria-disabled'), 'true');
+});

tests/unit-jq1.html

@@ -82,6 +82,7 @@
     <script src="options/width-tests.js" type="text/javascript"></script>
 
     <script src="results/focusing-tests.js" type="text/javascript"></script>
+    <script src="results/option-tests.js" type="text/javascript"></script>
 
     <script src="selection/allowClear-tests.js" type="text/javascript"></script>
     <script src="selection/containerCss-tests.js" type="text/javascript"></script>

tests/unit-jq2.html

@@ -82,6 +82,7 @@
     <script src="options/width-tests.js" type="text/javascript"></script>
 
     <script src="results/focusing-tests.js" type="text/javascript"></script>
+    <script src="results/option-tests.js" type="text/javascript"></script>
 
     <script src="selection/allowClear-tests.js" type="text/javascript"></script>
     <script src="selection/containerCss-tests.js" type="text/javascript"></script>

tests/unit-jq3.html

@@ -82,6 +82,7 @@
     <script src="options/width-tests.js" type="text/javascript"></script>
 
     <script src="results/focusing-tests.js" type="text/javascript"></script>
+    <script src="results/option-tests.js" type="text/javascript"></script>
 
     <script src="selection/allowClear-tests.js" type="text/javascript"></script>
     <script src="selection/containerCss-tests.js" type="text/javascript"></script>