Skip to content

Commit

Permalink
Merge branch 'main' into transient-button
Browse files Browse the repository at this point in the history
  • Loading branch information
mister-ben authored Jul 4, 2024
2 parents 7fc06a3 + f701102 commit f04178c
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 10 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
<a name="8.16.1"></a>
## [8.16.1](https://github.com/videojs/video.js/compare/v8.16.0...v8.16.1) (2024-06-24)

### Bug Fixes

* enable keyboard controls on menu items ([#8777](https://github.com/videojs/video.js/issues/8777)) ([04b9bb2](https://github.com/videojs/video.js/commit/04b9bb2)), closes [/github.com/videojs/video.js/commit/35de64ceb04b4b7dd6be067e275128d02c6d6e91#diff-9fd94576fe3b609171a426feb961b0954d70c8c14e598024d49ae9c8836a71](https://github.com//github.com/videojs/video.js/commit/35de64ceb04b4b7dd6be067e275128d02c6d6e91/issues/diff-9fd94576fe3b609171a426feb961b0954d70c8c14e598024d49ae9c8836a71) [1000#0](https://github.com/1000/issues/0)

### Chores

* Update typescript to 5.5.2 ([#8776](https://github.com/videojs/video.js/issues/8776)) ([fa9c41c](https://github.com/videojs/video.js/commit/fa9c41c))

<a name="8.16.0"></a>
# [8.16.0](https://github.com/videojs/video.js/compare/v8.15.0...v8.16.0) (2024-06-12)

Expand Down
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "video.js",
"description": "An HTML5 video player that supports HLS and DASH with a common API and skin.",
"version": "8.16.0",
"version": "8.16.1",
"main": "./dist/video.cjs.js",
"module": "./dist/video.es.js",
"style": "./dist/video-js.css",
Expand Down Expand Up @@ -160,7 +160,7 @@
"shelljs": "^0.8.5",
"shx": "^0.3.2",
"sinon": "^11.1.1",
"typescript": "^5.5.1-rc",
"typescript": "^5.5.2",
"uglify-js": "^3.6.0",
"unified": "^7.0.2",
"videojs-generate-karma-config": "^8.1.0",
Expand Down
4 changes: 2 additions & 2 deletions src/css/components/_audio.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
@extend .vjs-icon-audio;
}

.video-js .vjs-audio-button + .vjs-menu .vjs-description-menu-item .vjs-menu-item-text .vjs-icon-placeholder,
.video-js .vjs-audio-button + .vjs-menu .vjs-descriptions-menu-item .vjs-menu-item-text .vjs-icon-placeholder,
.video-js .vjs-audio-button + .vjs-menu .vjs-main-desc-menu-item .vjs-menu-item-text .vjs-icon-placeholder {
vertical-align: middle;
display: inline-block;
margin-bottom: -0.1em;
}

// Mark a main-desc-menu-item (main + description) or description item with a trailing Audio Description icon
.video-js .vjs-audio-button + .vjs-menu .vjs-description-menu-item .vjs-menu-item-text .vjs-icon-placeholder:before,
.video-js .vjs-audio-button + .vjs-menu .vjs-descriptions-menu-item .vjs-menu-item-text .vjs-icon-placeholder:before,
.video-js .vjs-audio-button + .vjs-menu .vjs-main-desc-menu-item .vjs-menu-item-text .vjs-icon-placeholder:before {
font-family: VideoJS;
content: " \f12e";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class AudioTrackMenuItem extends MenuItem {
const el = super.createEl(type, props, attrs);
const parentSpan = el.querySelector('.vjs-menu-item-text');

if (['main-desc', 'description'].indexOf(this.options_.track.kind) >= 0) {
if (['main-desc', 'descriptions'].indexOf(this.options_.track.kind) >= 0) {
parentSpan.appendChild(Dom.createEl('span', {
className: 'vjs-icon-placeholder'
}, {
Expand Down
2 changes: 1 addition & 1 deletion src/js/menu/menu-item.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ class MenuItem extends ClickableComponent {
* @listens keydown
*/
handleKeyDown(event) {
if (['Tab', 'Escape', 'ArrowUp', 'ArrowLeft', 'ArrowRight', 'ArrowDown'].includes(event.key)) {
if (!['Tab', 'Escape', 'ArrowUp', 'ArrowLeft', 'ArrowRight', 'ArrowDown'].includes(event.key)) {
// Pass keydown handling up for unused keys
super.handleKeyDown(event);
}
Expand Down

0 comments on commit f04178c

Please sign in to comment.