Bug fixes

This commit is contained in:
Sam Potts
2018-03-28 22:45:11 +11:00
parent 2b7fe9a4f9
commit c4e2e24643
23 changed files with 125 additions and 42 deletions

37
dist/plyr.js vendored
View File

@ -3533,9 +3533,14 @@ var controls = {
// Set a list of available captions languages
setSpeedMenu: function setSpeedMenu() {
setSpeedMenu: function setSpeedMenu(options) {
var _this4 = this;
// Do nothing if not selected
if (!this.config.controls.includes('settings') || !this.config.settings.includes('speed')) {
return;
}
// Menu required
if (!utils.is.element(this.elements.settings.panes.speed)) {
return;
@ -3543,9 +3548,11 @@ var controls = {
var type = 'speed';
// Set the default speeds
if (!utils.is.array(this.options.speed) || !this.options.speed.length) {
// Set the speed options
if (!utils.is.array(options)) {
this.options.speed = [0.5, 0.75, 1, 1.25, 1.5, 1.75, 2];
} else {
this.options.speed = options;
}
// Set options if passed and filter based on config
@ -3557,6 +3564,9 @@ var controls = {
var toggle = !utils.is.empty(this.options.speed);
controls.toggleTab.call(this, type, toggle);
// Check if we need to toggle the parent
controls.checkMenu.call(this);
// If we're hiding, nothing more to do
if (!toggle) {
return;
@ -3581,6 +3591,15 @@ var controls = {
},
// Check if we need to hide/show the settings menu
checkMenu: function checkMenu() {
var speedHidden = this.elements.settings.tabs.speed.getAttribute('hidden') !== null;
var languageHidden = this.elements.settings.tabs.captions.getAttribute('hidden') !== null;
utils.toggleHidden(this.elements.settings.menu, speedHidden && languageHidden);
},
// Show/hide menu
toggleMenu: function toggleMenu(event) {
var form = this.elements.settings.form;
@ -3971,7 +3990,7 @@ var controls = {
this.elements.controls = container;
if (this.config.controls.includes('settings') && this.config.settings.includes('speed')) {
if (this.isHTML5) {
controls.setSpeedMenu.call(this);
}
@ -4179,7 +4198,7 @@ var Listeners = function () {
case 39:
// Arrow forward
this.player.fastForward();
this.player.forward();
break;
case 37:
@ -5710,7 +5729,8 @@ var youtube = {
});
// Get available speeds
player.options.speed = instance.getAvailablePlaybackRates();
var options = instance.getAvailablePlaybackRates();
controls.setSpeedMenu.call(player, options);
// Set the tabindex to avoid focus entering iframe
if (player.supported.ui) {
@ -5987,6 +6007,11 @@ var vimeo = {
player.embed.setPlaybackRate(input).then(function () {
speed = input;
utils.dispatchEvent.call(player, player.media, 'ratechange');
}).catch(function (error) {
// Hide menu item (and menu if empty)
if (error.name === 'Error') {
controls.setSpeedMenu.call(player, []);
}
});
}
});

2
dist/plyr.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/plyr.min.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -5268,7 +5268,7 @@ var defaults = {
// Sprite (for icons)
loadSprite: true,
iconPrefix: 'plyr',
iconUrl: 'https://cdn.plyr.io/3.0.6/plyr.svg',
iconUrl: 'https://cdn.plyr.io/3.0.7/plyr.svg',
// Blank video (used to prevent errors on source change)
blankVideo: 'https://cdn.plyr.io/static/blank.mp4',
@ -8714,9 +8714,14 @@ var controls = {
// Set a list of available captions languages
setSpeedMenu: function setSpeedMenu() {
setSpeedMenu: function setSpeedMenu(options) {
var _this4 = this;
// Do nothing if not selected
if (!this.config.controls.includes('settings') || !this.config.settings.includes('speed')) {
return;
}
// Menu required
if (!utils.is.element(this.elements.settings.panes.speed)) {
return;
@ -8724,9 +8729,11 @@ var controls = {
var type = 'speed';
// Set the default speeds
if (!utils.is.array(this.options.speed) || !this.options.speed.length) {
// Set the speed options
if (!utils.is.array(options)) {
this.options.speed = [0.5, 0.75, 1, 1.25, 1.5, 1.75, 2];
} else {
this.options.speed = options;
}
// Set options if passed and filter based on config
@ -8738,6 +8745,9 @@ var controls = {
var toggle = !utils.is.empty(this.options.speed);
controls.toggleTab.call(this, type, toggle);
// Check if we need to toggle the parent
controls.checkMenu.call(this);
// If we're hiding, nothing more to do
if (!toggle) {
return;
@ -8762,6 +8772,15 @@ var controls = {
},
// Check if we need to hide/show the settings menu
checkMenu: function checkMenu() {
var speedHidden = this.elements.settings.tabs.speed.getAttribute('hidden') !== null;
var languageHidden = this.elements.settings.tabs.captions.getAttribute('hidden') !== null;
utils.toggleHidden(this.elements.settings.menu, speedHidden && languageHidden);
},
// Show/hide menu
toggleMenu: function toggleMenu(event) {
var form = this.elements.settings.form;
@ -9152,7 +9171,7 @@ var controls = {
this.elements.controls = container;
if (this.config.controls.includes('settings') && this.config.settings.includes('speed')) {
if (this.isHTML5) {
controls.setSpeedMenu.call(this);
}
@ -9360,7 +9379,7 @@ var Listeners = function () {
case 39:
// Arrow forward
this.player.fastForward();
this.player.forward();
break;
case 37:
@ -10891,7 +10910,8 @@ var youtube = {
});
// Get available speeds
player.options.speed = instance.getAvailablePlaybackRates();
var options = instance.getAvailablePlaybackRates();
controls.setSpeedMenu.call(player, options);
// Set the tabindex to avoid focus entering iframe
if (player.supported.ui) {
@ -11168,6 +11188,11 @@ var vimeo = {
player.embed.setPlaybackRate(input).then(function () {
speed = input;
utils.dispatchEvent.call(player, player.media, 'ratechange');
}).catch(function (error) {
// Hide menu item (and menu if empty)
if (error.name === 'Error') {
controls.setSpeedMenu.call(player, []);
}
});
}
});
@ -11590,7 +11615,7 @@ var source = {
// ==========================================================================
// Plyr
// plyr.js v3.0.6
// plyr.js v3.0.7
// https://github.com/sampotts/plyr
// License: The MIT License (MIT)
// ==========================================================================

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long