Skip to content

player: Ensure video retains consistent sizing #9

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.

Sign up for GitHub

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

Merged
awilfox merged 2 commits into from
May 27, 2025
Merged

player: Ensure video retains consistent sizing #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ed2eb8
player: Ensure video retains consistent sizing
awilfox May 27, 2025
ee9f218
stylesheets: Remove hard-coded video height
awilfox May 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions app/assets/stylesheets/includes/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,21 +320,6 @@ strong {
// ////////////////////////////////////////////////////////////
// Media

/*
Browsers and/or MediaElement.js don't seem to honor these,
but let's document it here anyway.
*/

video {
height: 270px; /* MediaElement.js default height */
width: 100%;
}

audio {
height: 40px;
width: 100%;
}

/// additional MediaElement.js styles

.mejs__overlay-button {
Expand Down
1 change: 1 addition & 0 deletions app/views/player/_player_head_additional.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
// (when the HLS stream contains WebVTT captions)
hls: { enableWebVTT: false },
iconSprite: "/assets/icons/mejs-controls.svg",
stretching: 'responsive',
success: function (mediaElement, originalNode, instance) {
if (typeof dashjs !== "undefined") {
// workaround for mediaelement/mediaelement#2964
Expand Down
4 changes: 1 addition & 3 deletions app/views/player/_video.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<%# TODO: figure out how to programmatically set height with JavaScript, or something %>
<%# should match app/assets/stylesheets/application.scss %>
<video id="video-<%= index %>" width="100%" height="270" preload="<%= preload %>" controls crossorigin="anonymous">
<video id="video-<%= index %>" preload="<%= preload %>" controls crossorigin="anonymous">
<% if browser.platform.ios? || browser.device.ipad? %>
<source src="<%= track.hls_uri %>" type="<%= BerkeleyLibrary::AV::Track::SOURCE_TYPE_HLS %>"/>
<%# a separate track tag is not necessary here for captions as Wowza sends them as part of the HLS stream, and iOS will auto discover them %>
Expand Down