diff options
| author | Sam Potts <sam@potts.es> | 2019-06-20 23:56:19 +1000 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2019-06-20 23:56:19 +1000 |
| commit | e8e2b8ba397887bae16ac39dc001503380c4dd68 (patch) | |
| tree | bf7e5e719cfa7112f1ff0c2e156ec2233c6ab649 /src | |
| parent | 2e40b91ec1aabf33e945cba66fbcdd9b7aa53ba7 (diff) | |
| parent | 1e761e237aceb49b29291946a39eef958d6da966 (diff) | |
| download | plyr-e8e2b8ba397887bae16ac39dc001503380c4dd68.tar.lz plyr-e8e2b8ba397887bae16ac39dc001503380c4dd68.tar.xz plyr-e8e2b8ba397887bae16ac39dc001503380c4dd68.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/js/config/defaults.js | 2 | ||||
| -rw-r--r-- | src/js/plyr.js | 2 | ||||
| -rw-r--r-- | src/js/plyr.polyfilled.js | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/js/config/defaults.js b/src/js/config/defaults.js index 087500b7..4bb0e8d5 100644 --- 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', diff --git a/src/js/plyr.js b/src/js/plyr.js index 83897cab..84fa87fa 100644 --- 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) // ========================================================================== diff --git a/src/js/plyr.polyfilled.js b/src/js/plyr.polyfilled.js index 0f1e7e25..c87bbd8c 100644 --- 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) // ========================================================================== |