Merge branch 'develop' of https://github.com/Selz/plyr into develop

This commit is contained in:
Sam Potts 2017-04-25 18:37:36 +10:00
commit 897d49ad87
3 changed files with 8 additions and 17 deletions

1
.gitignore vendored
View File

@ -4,6 +4,7 @@ node_modules
.DS_Store
aws.json
*.mp4
!dist/blank.mp4
index-*.html
notes.txt
.idea

BIN
dist/blank.mp4 vendored Normal file

Binary file not shown.

View File

@ -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