Skip to content

Commit

Permalink
⬆️ Bump plyr from 3.3.23 to 3.4.3 (#13)
Browse files Browse the repository at this point in the history
* ⬆️ Bump plyr from 3.3.23 to 3.4.0

Bumps [plyr](https://github.com/sampotts/plyr) from 3.3.23 to 3.4.0.
- [Release notes](https://github.com/sampotts/plyr/releases)
- [Changelog](https://github.com/sampotts/plyr/blob/master/changelog.md)
- [Commits](sampotts/plyr@v3.3.23...v3.4.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* ⬆️ Update Plyr assets

* 👽 Ajust settings due to plyr changes

* ⬆️ Update plyr
  • Loading branch information
dependabot[bot] authored and jonnitto committed Aug 14, 2018
1 parent a37a8ac commit 303a7d8
Show file tree
Hide file tree
Showing 40 changed files with 2,997 additions and 2,226 deletions.
1 change: 0 additions & 1 deletion Configuration/Settings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ Jonnitto:
- 480
- 360
- 240
- default #YouTube's "auto"
loop:
# Whether to loop the current video. If the loop attribute is present
# on a <video> or <audio> element, this will be automatically set to
Expand Down
7 changes: 3 additions & 4 deletions Resources/Private/Assets/Scripts/captions.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// ==========================================================================

import controls from './controls';
import i18n from './i18n';
import support from './support';
import { dedupe } from './utils/arrays';
import browser from './utils/browser';
Expand All @@ -18,6 +17,7 @@ import {
} from './utils/elements';
import { on, triggerEvent } from './utils/events';
import fetch from './utils/fetch';
import i18n from './utils/i18n';
import is from './utils/is';
import { getHTML } from './utils/strings';
import { parseUrl } from './utils/urls';
Expand Down Expand Up @@ -83,9 +83,8 @@ const captions = {
// * active: The state preferred by user settings or config
// * toggled: The real captions state

const languages = dedupe(
Array.from(navigator.languages || navigator.language || navigator.userLanguage).map(language => language.split('-')[0]),
);
const browserLanguages = navigator.languages || [navigator.language || navigator.userLanguage || 'en'];
const languages = dedupe(browserLanguages.map(language => language.split('-')[0]));

let language = (this.storage.get('language') || this.config.captions.language || 'auto').toLowerCase();

Expand Down
20 changes: 6 additions & 14 deletions Resources/Private/Assets/Scripts/config/defaults.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,19 +68,7 @@ const defaults = {
// Quality default
quality: {
default: 576,
options: [
4320,
2880,
2160,
1440,
1080,
720,
576,
480,
360,
240,
'default', // YouTube's "auto"
],
options: [4320, 2880, 2160, 1440, 1080, 720, 576, 480, 360, 240],
},

// Set loops
Expand Down Expand Up @@ -268,8 +256,9 @@ const defaults = {

// YouTube
'statechange',

// Quality
'qualitychange',
'qualityrequested',

// Ads
'adsloaded',
Expand Down Expand Up @@ -354,6 +343,9 @@ const defaults = {
isTouch: 'plyr--is-touch',
uiSupported: 'plyr--full-ui',
noTransition: 'plyr--no-transition',
display: {
time: 'plyr__time',
},
menu: {
value: 'plyr__menu__value',
badge: 'plyr__badge',
Expand Down
Loading

0 comments on commit 303a7d8

Please sign in to comment.