ProximaEntertainment/plyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

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

BIN
dist/blank.mp4 vendored Normal file
View File

Binary file not shown.

16
src/js/plyr.js
View File

@ -809,12 +809,6 @@
return (url.match(regex)) ? RegExp.$2 : url; 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 // Fullscreen API
var fullscreen = (function() { var fullscreen = (function() {
// Determine the prefix // Determine the prefix
@ -2241,10 +2235,6 @@
mediaId = parseYouTubeId(player.embedId); mediaId = parseYouTubeId(player.embedId);
break; break;
case 'vimeo':
mediaId = parseVimeoId(player.embedId);
break;
default: default:
mediaId = player.embedId; mediaId = player.embedId;
} }
@ -2539,9 +2529,9 @@
function vimeoReady(mediaId, container) { function vimeoReady(mediaId, container) {
// Setup instance // Setup instance
// https://github.com/vimeo/player.js // https://github.com/vimeo/player.js
player.embed = new window.Vimeo.Player(container, { plyr.embed = new window.Vimeo.Player(container, {
id: parseInt(mediaId), id: mediaId,
loop: config.loop.active, loop: config.loop,
autoplay: config.autoplay, autoplay: config.autoplay,
byline: false, byline: false,
portrait: false, portrait: false,