Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(control-bar): incorrect display when control bar display is locked #8435

Merged
merged 1 commit into from
Sep 27, 2023

Conversation

amtins
Copy link
Contributor

@amtins amtins commented Sep 10, 2023

Description

The control bar is not displayed correctly when the display is locked because .vjs-lock-showing uses display block instead of flex.

Screenshot from 2023-09-10 16-03-40

Specific Changes proposed

  • use display flex instead of display block when the control bar has .vjs-lock-showing class
  • ensure that the control bar is not displayed if the player has classes:
    • .vjs-controls-disabled
    • .vjs-using-native-controls
    • .vjs-error

Requirements Checklist

  • Feature implemented / Bug fixed
  • If necessary, more likely in a feature request than a bug fix
    • Change has been verified in an actual browser (Chrome, Firefox, IE)
    • Unit Tests updated or fixed
    • Docs/guides updated
    • Example created (starter template on JSBin)
  • Reviewed by Two Core Contributors

The control bar is not displayed correctly when the display is locked because `.vjs-lock-showing` uses `display` `block` instead of `flex`.

- use `display` `flex` instead of `display` `block` when the control bar has `.vjs-lock-showing` class
- ensure that the control bar is not displayed if the `player` has classes:
  - `.vjs-controls-disabled`
  - `.vjs-using-native-controls`
  - `.vjs-error`
@codecov
Copy link

codecov bot commented Sep 10, 2023

Codecov Report

Merging #8435 (ab67918) into main (b95cd7a) will not change coverage.
Report is 1 commits behind head on main.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main    #8435   +/-   ##
=======================================
  Coverage   82.68%   82.68%           
=======================================
  Files         113      113           
  Lines        7578     7578           
  Branches     1821     1821           
=======================================
  Hits         6266     6266           
  Misses       1312     1312           

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

Copy link
Contributor

@mister-ben mister-ben left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think lock showing had only really been considered in terms of menu buttons before. Good to implement it properly here too.

@mister-ben mister-ben merged commit 473176f into videojs:main Sep 27, 2023
@amtins amtins deleted the fix/control-bar-lock-showing branch November 5, 2023 16:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants