diff options
| author | Sam Potts <me@sampotts.me> | 2017-04-25 18:37:36 +1000 |
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2017-04-25 18:37:36 +1000 |
| commit | 897d49ad870094faa59e73956b95e56f002677e6 (patch) | |
| tree | 6bb9a632120bffbce1aab90e8f694fe687961fa0 | |
| parent | 1960d35d8b8319614adb4a7852a9614dfa8c1eb1 (diff) | |
| parent | 0b7d0dedf69b80ed888c379801ac65ed577d3d75 (diff) | |
| download | plyr-897d49ad870094faa59e73956b95e56f002677e6.tar.lz plyr-897d49ad870094faa59e73956b95e56f002677e6.tar.xz plyr-897d49ad870094faa59e73956b95e56f002677e6.zip | |
Merge branch 'develop' of https://github.com/Selz/plyr into develop
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | dist/blank.mp4 | bin | 0 -> 1777 bytes | |||
| -rw-r--r-- | src/js/plyr.js | 24 |
3 files changed, 8 insertions, 17 deletions
@@ -4,6 +4,7 @@ node_modules .DS_Store aws.json *.mp4 +!dist/blank.mp4 index-*.html notes.txt .idea diff --git a/dist/blank.mp4 b/dist/blank.mp4 Binary files differnew file mode 100644 index 00000000..d8982b63 --- /dev/null +++ b/dist/blank.mp4 diff --git a/src/js/plyr.js b/src/js/plyr.js index 99a70b88..ed052664 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -809,12 +809,6 @@ return (url.match(regex)) ? RegExp.$2 : url; } - // Parse Vimeo ID from url - function parseVimeoId(url) { - var regex = /^.*(vimeo.com\/|video\/)(\d+).*/; - return (url.match(regex)) ? RegExp.$2 : url; - } - // Fullscreen API var fullscreen = (function() { // Determine the prefix @@ -2241,10 +2235,6 @@ mediaId = parseYouTubeId(player.embedId); break; - case 'vimeo': - mediaId = parseVimeoId(player.embedId); - break; - default: mediaId = player.embedId; } @@ -2539,13 +2529,13 @@ function vimeoReady(mediaId, container) { // Setup instance // https://github.com/vimeo/player.js - player.embed = new window.Vimeo.Player(container, { - id: parseInt(mediaId), - loop: config.loop.active, - autoplay: config.autoplay, - byline: false, - portrait: false, - title: false + plyr.embed = new window.Vimeo.Player(container, { + id: mediaId, + loop: config.loop, + autoplay: config.autoplay, + byline: false, + portrait: false, + title: false }); // Create a faux HTML5 API using the Vimeo API |