Maintain support for the old listbox HTML

craftcms · Oct 2, 2022 · ba78573 · ba78573
1 parent ce3ffd3
commit ba78573
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/web/assets/cp/dist/cp.js b/src/web/assets/cp/dist/cp.js
diff --git a/src/web/assets/cp/dist/cp.js.map b/src/web/assets/cp/dist/cp.js.map
diff --git a/src/web/assets/cp/src/js/Listbox.js b/src/web/assets/cp/src/js/Listbox.js
@@ -21,10 +21,15 @@ Craft.Listbox = Garnish.Base.extend(
       }
 
       this.$container.data('listbox', this);
-      this.$options = this.$container.find('button');
+      // todo: drop [role=option] in Craft 5
+      this.$options = this.$container.find('button,[role=option]');
 
       // is there already a selected option?
-      this.$selectedOption = this.$options.filter('[aria-pressed=true]');
+      // todo: drop [aria-selected=true] & attr normalization in Craft 5
+      this.$selectedOption = this.$options
+        .filter('[aria-pressed=true],[aria-selected=true]')
+        .removeAttr('aria-selected')
+        .attr('aria-pressed', 'true');
       if (this.$selectedOption.length) {
         this.selectedOptionIndex = this.$options.index(this.$selectedOption);
       } else {