Skip to content

Commit 97d9228

Browse files
committed
Aspect ratio tweaks
1 parent 0f14865 commit 97d9228

File tree

5 files changed

+17
-19
lines changed

5 files changed

+17
-19
lines changed

src/js/html5.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,10 @@ const html5 = {
4444

4545
const player = this;
4646

47-
// Set aspect ratio if set
48-
setAspectRatio.call(player);
47+
// Set aspect ratio if fixed
48+
if (!is.empty(this.config.ratio)) {
49+
setAspectRatio.call(player);
50+
}
4951

5052
// Quality
5153
Object.defineProperty(player.media, 'quality', {

src/js/listeners.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,8 +336,13 @@ class Listeners {
336336
on.call(player, elements.container, 'enterfullscreen exitfullscreen', event => {
337337
const { target, usingNative } = player.fullscreen;
338338

339-
// Ignore for iOS native
340-
if (!player.isEmbed || target !== elements.container) {
339+
// Ignore events not from target
340+
if (target !== elements.container) {
341+
return;
342+
}
343+
344+
// If it's not an embed and no ratio specified
345+
if (!player.isEmbed && is.empty(player.config.ratio)) {
341346
return;
342347
}
343348

src/js/utils/elements.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -192,11 +192,8 @@ export function toggleHidden(element, hidden) {
192192
hide = !element.hidden;
193193
}
194194

195-
if (hide) {
196-
element.setAttribute('hidden', '');
197-
} else {
198-
element.removeAttribute('hidden');
199-
}
195+
// eslint-disable-next-line no-param-reassign
196+
element.hidden = hide;
200197
}
201198

202199
// Mirror Element.classList.toggle, with IE compatibility for "force" argument

src/js/utils/style.js

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,8 @@ export function reduceAspectRatio(ratio) {
2727
}
2828

2929
export function getAspectRatio(input) {
30-
const parse = ratio => {
31-
if (!validateRatio(ratio)) {
32-
return null;
33-
}
34-
35-
return ratio.split(':').map(Number);
36-
};
37-
38-
// Provided ratio
30+
const parse = ratio => (validateRatio(ratio) ? ratio.split(':').map(Number) : null);
31+
// Try provided ratio
3932
let ratio = parse(input);
4033

4134
// Get from config

src/sass/lib/mixins.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,13 @@
6262

6363
.plyr__video-wrapper {
6464
height: 100%;
65-
width: 100%;
65+
position: static;
6666
}
6767

6868
// Vimeo requires some different styling
6969
&.plyr--vimeo .plyr__video-wrapper {
7070
height: 0;
71+
position: relative;
7172
top: 50%;
7273
transform: translateY(-50%);
7374
}

0 commit comments

Comments
 (0)