Sync with Kendo UI Professional

Author: Kendo Bot

package.json

@@ -11,10 +11,10 @@
   "version": "1.0.0",
   "dependencies": {},
   "devDependencies": {
-    "@progress/kendo-theme-bootstrap": "4.41.2",
-    "@progress/kendo-theme-default": "4.41.2",
-    "@progress/kendo-theme-material": "4.41.2",
-    "@progress/kendo-theme-classic": "4.41.2",
+    "@progress/kendo-theme-bootstrap": "4.42.0",
+    "@progress/kendo-theme-default": "4.42.0",
+    "@progress/kendo-theme-material": "4.42.0",
+    "@progress/kendo-theme-classic": "4.42.0",
     "amd-optimize": "0.6.1",
     "autoprefixer": "^9.1.5",
     "axe-core": "^4.3.0",

src/kendo.listbox.js

@@ -945,8 +945,17 @@ var __meta__ = { // jshint ignore:line
         },
 
         _list: function () {
-            var that = this;
-            $("<ul class='" + LIST_CLASS + "' role='listbox'></ul>").appendTo(that._innerWrapper);
+            var that = this,
+                list = $("<ul class='" + LIST_CLASS + "' role='listbox'></ul>"),
+                selectable = that.options.selectable,
+                selectableOptions = Selectable.parseOptions(selectable);
+
+            if (selectableOptions.multiple) {
+                list.attr("aria-multiselectable", "true");
+            }
+
+            list.appendTo(that._innerWrapper);
+
             if(that.options.navigatable) {
                 that._getList().attr(TABINDEX, that._getTabIndex());
             }
@@ -1071,10 +1080,6 @@ var __meta__ = { // jshint ignore:line
             var selectable = that.options.selectable;
             var selectableOptions = Selectable.parseOptions(selectable);
 
-            if (selectableOptions.multiple) {
-                that.element.attr("aria-multiselectable", "true");
-            }
-
             that.selectable = new Selectable(that._innerWrapper, {
                 aria: true,
                 multiple: selectableOptions.multiple,

src/kendo.listview.js

@@ -518,6 +518,10 @@ var __meta__ = { // jshint ignore:line
                     }
                 });
 
+                if(multi) {
+                    that.element.attr("aria-multiselectable", true);
+                }
+
                 if (navigatable) {
                     that.element.on("keydown" + NS, function(e) {
 

src/kendo.selectable.js

@@ -56,10 +56,6 @@ var __meta__ = { // jshint ignore:line
 
             multiple = that.options.multiple;
 
-            if (this.options.aria && multiple) {
-                that.element.attr("aria-multiselectable", true);
-            }
-
             that.userEvents = new kendo.UserEvents(that.element, {
                 global: true,
                 allowSelection: true,

tests/listbox/aria.js

@@ -49,6 +49,12 @@
 
             axeRunFixture(done);
         });
+
+        it("multiselectable ListBox has 'aria-multiselectable' on the element with role='listbox'", function() {
+            createListBox();
+
+            assert.equal(Mocha.fixture.find("[role='listbox']").attr("aria-multiselectable"), "true");
+        });
     });
 
     describe("ListBox aria", function () {

tests/selectable/selectable.js

@@ -750,24 +750,6 @@
             assert.isOk(ul.children().eq(2).hasClass(SELECTED), "Third item must be selected");
         });
 
-        it("multiple selection adds aria attribute", function() {
-            new Selectable(ul, { aria: true, multiple: true });
-
-            assert.isOk(ul.is("[aria-multiselectable]"));
-        });
-
-        it("non-aria selectable does not add aria-multiselectable", function() {
-            new Selectable(ul, { multiple: true });
-
-            assert.isOk(!ul.is("[aria-multiselectable]"));
-        });
-
-        it("non-aria selectable does not add aria-multiselectable", function() {
-            new Selectable(ul, { aria: true });
-
-            assert.isOk(!ul.is("[aria-multiselectable]"));
-        });
-
         it("_invalidateSelectables calls _collidesWithActiveElement", function() {
             var selectable =  new Selectable(ul, { multiple: true });
 

typescript/kendo.all.d.ts

@@ -6202,6 +6202,7 @@ declare namespace kendo.ui {
         dataSource?: any|any|kendo.data.DataSource | undefined;
         detailTemplate?: string|Function | undefined;
         editable?: boolean | "inline" | "incell" | "popup" | GridEditable | undefined;
+        encodeTitles?: boolean;
         excel?: GridExcel | undefined;
         filterable?: boolean | GridFilterable | undefined;
         groupable?: boolean | GridGroupable | undefined;