Skip to content

Allow the quality to be a string #878

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

Closed
wants to merge 1 commit into from
Closed

Allow the quality to be a string #878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 deletions src/js/html5.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@
import support from './support';
import utils from './utils';

function mapQualityUnit(input) {
const resolution = parseInt(input, 10);
if (utils.is.number(resolution)) {
return resolution;
}
return input;
}

const html5 = {
getSources() {
if (!this.isHTML5) {
Expand Down Expand Up @@ -36,7 +44,7 @@ const html5 = {
}

// Reduce to unique list
return utils.dedupe(sizes.map(source => Number(source.getAttribute('size'))));
return utils.dedupe(sizes.map(source => mapQualityUnit(source.getAttribute('size'))));
},

extend() {
Expand All @@ -62,7 +70,7 @@ const html5 = {
return null;
}

return Number(matches[0].getAttribute('size'));
return mapQualityUnit(matches[0].getAttribute('size'));
},
set(input) {
// Get sources
Expand All @@ -73,7 +81,7 @@ const html5 = {
}

// Get matches for requested size
const matches = Array.from(sources).filter(source => Number(source.getAttribute('size')) === input);
const matches = Array.from(sources).filter(source => mapQualityUnit(source.getAttribute('size')) === input);

// No matches for requested size
if (utils.is.empty(matches)) {
Expand Down
8 changes: 4 additions & 4 deletions src/js/plyr.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,18 +677,18 @@ class Plyr {
let quality = null;

if (!utils.is.empty(input)) {
quality = Number(input);
quality = input;
}

if (!utils.is.number(quality) || quality === 0) {
if (utils.is.empty(quality)) {
quality = this.storage.get('quality');
}

if (!utils.is.number(quality)) {
if (utils.is.empty(quality)) {
quality = this.config.quality.selected;
}

if (!utils.is.number(quality)) {
if (utils.is.empty(quality)) {
quality = this.config.quality.default;
}

Expand Down