Merge branch 'master' into develop

# Conflicts: # .eslintrc # demo/dist/demo.css # demo/dist/demo.js # demo/dist/demo.min.js # demo/dist/demo.min.js.map # dist/plyr.css # dist/plyr.js # dist/plyr.min.js # dist/plyr.min.js.map # dist/plyr.min.mjs # dist/plyr.min.mjs.map # dist/plyr.mjs # dist/plyr.polyfilled.js # dist/plyr.polyfilled.min.js # dist/plyr.polyfilled.min.js.map # dist/plyr.polyfilled.min.mjs # dist/plyr.polyfilled.min.mjs.map # dist/plyr.polyfilled.mjs # package.json # readme.md # src/js/listeners.js # yarn.lock
2019-06-20 23:56:19 +10:00
parent 2e40b91ec1 1e761e237a
commit e8e2b8ba39
23 changed files with 2472 additions and 2435 deletions
--- a/src/js/config/defaults.js
+++ b/src/js/config/defaults.js
@ -61,7 +61,7 @@ const defaults = {
    // Sprite (for icons)
    loadSprite: true,
    iconPrefix: 'plyr',
-    iconUrl: 'https://cdn.plyr.io/3.5.2/plyr.svg',
+    iconUrl: 'https://cdn.plyr.io/3.5.4/plyr.svg',

    // Blank video (used to prevent errors on source change)
    blankVideo: 'https://cdn.plyr.io/static/blank.mp4',
--- a/src/js/plyr.js
+++ b/src/js/plyr.js
@ -1,6 +1,6 @@
 // ==========================================================================
 // Plyr
-// plyr.js v3.5.3
+// plyr.js v3.5.4
 // https://github.com/sampotts/plyr
 // License: The MIT License (MIT)
 // ==========================================================================
--- a/src/js/plyr.polyfilled.js
+++ b/src/js/plyr.polyfilled.js
@ -1,6 +1,6 @@
 // ==========================================================================
 // Plyr Polyfilled Build
-// plyr.js v3.5.3
+// plyr.js v3.5.4
 // https://github.com/sampotts/plyr
 // License: The MIT License (MIT)
 // ==========================================================================