ProximaEntertainment/plyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Formatting

Browse Source
This commit is contained in:
Sam Potts 2017-10-02 21:03:51 +11:00
parent 15cffad89e
commit d6977473b1
4 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.eslintrc.json
View File

@ -10,9 +10,13 @@
"no-unused-vars": "warn", "no-unused-vars": "warn",
"constructor-super": "warn", "constructor-super": "warn",
"valid-typeof": "warn", "valid-typeof": "warn",
"indent": ["error", 4, { "indent": [
"SwitchCase": 1 "error",
}], 4,
{
"SwitchCase": 1
}
],
"quotes": ["error", "single"], "quotes": ["error", "single"],
"semi": ["error", "always"], "semi": ["error", "always"],
"eqeqeq": ["error", "always"] "eqeqeq": ["error", "always"]

2
demo/dist/demo.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/plyr.js vendored
View File

File diff suppressed because one or more lines are too long

41
src/js/plyr.js
View File

@ -2378,7 +2378,10 @@
player.captions.tracks = null; player.captions.tracks = null;
// Clear menu and hide // Clear menu and hide
if (utils.inArray(player.config.controls, 'settings') && utils.inArray(player.config.settings, 'captions')) { if (
utils.inArray(player.config.controls, 'settings') &&
utils.inArray(player.config.settings, 'captions')
) {
setCaptionsMenu(); setCaptionsMenu();
} }
@ -2461,7 +2464,10 @@
}); });
// Check if suported kind // Check if suported kind
var supported = utils.inArray(['captions', 'subtitles'], player.captions.currentTrack && player.captions.currentTrack.kind); var supported = utils.inArray(
['captions', 'subtitles'],
player.captions.currentTrack && player.captions.currentTrack.kind
);
if (utils.is.track(player.captions.currentTrack) && supported) { if (utils.is.track(player.captions.currentTrack) && supported) {
utils.on(player.captions.currentTrack, 'cuechange', setActiveCue); utils.on(player.captions.currentTrack, 'cuechange', setActiveCue);
@ -2476,7 +2482,10 @@
} }
// Set available languages in list // Set available languages in list
if (utils.inArray(player.config.controls, 'settings') && utils.inArray(player.config.settings, 'captions')) { if (
utils.inArray(player.config.controls, 'settings') &&
utils.inArray(player.config.settings, 'captions')
) {
setCaptionsMenu(); setCaptionsMenu();
} }
} }
@ -3065,7 +3074,10 @@
player.media.muted = instance.isMuted(); player.media.muted = instance.isMuted();
// Get available speeds // Get available speeds
if (utils.inArray(player.config.controls, 'settings') && utils.inArray(player.config.settings, 'speed')) { if (
utils.inArray(player.config.controls, 'settings') &&
utils.inArray(player.config.settings, 'speed')
) {
setSpeedMenu(instance.getAvailablePlaybackRates(), instance.getPlaybackRate()); setSpeedMenu(instance.getAvailablePlaybackRates(), instance.getPlaybackRate());
} }
@ -3393,7 +3405,7 @@
function toggleMenu(event) { function toggleMenu(event) {
var form = player.elements.settings.form; var form = player.elements.settings.form;
var button = player.elements.buttons.settings; var button = player.elements.buttons.settings;
var show = utils.is.boolean(event) ? event : (form && form.getAttribute('aria-hidden') === 'true'); var show = utils.is.boolean(event) ? event : form && form.getAttribute('aria-hidden') === 'true';
if (utils.is.event(event)) { if (utils.is.event(event)) {
var isMenuItem = form && form.contains(event.target); var isMenuItem = form && form.contains(event.target);
@ -3960,20 +3972,15 @@
var trigger = player.elements.buttons[play ? 'play' : 'pause']; var trigger = player.elements.buttons[play ? 'play' : 'pause'];
var target = player.elements.buttons[play ? 'pause' : 'play']; var target = player.elements.buttons[play ? 'pause' : 'play'];
// Setup focus and tab focus // Transfer focus
if (target) { if (target && trigger) {
var hadTabFocus = utils.hasClass(trigger, player.config.classNames.tabFocus); if (utils.hasClass(trigger, player.config.classNames.tabFocus)) {
setTimeout(function() {
setTimeout(function() {
if (utils.is.htmlElement(target)) {
target.focus(); target.focus();
}
if (hadTabFocus) {
utils.toggleClass(trigger, player.config.classNames.tabFocus, false); utils.toggleClass(trigger, player.config.classNames.tabFocus, false);
utils.toggleClass(target, player.config.classNames.tabFocus, true); utils.toggleClass(target, player.config.classNames.tabFocus, true);
} }, 0);
}, 100); }
} }
} }
@ -4209,7 +4216,7 @@
} }
function onBlur(event) { function onBlur(event) {
utils.toggleClass(event.target, 'tab-focus', false); utils.toggleClass(event.target, player.config.classNames.tabFocus, false);
} }
// Trigger custom and default handlers // Trigger custom and default handlers