Skip to content
Permalink
Browse files Browse the repository at this point in the history
Video embed: test yt/vimeo id (fixes #764)
  • Loading branch information
aFarkas committed Apr 15, 2020
1 parent a2f37ec commit 3720ab8
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
16 changes: 13 additions & 3 deletions plugins/video-embed/ls.video-embed.js
Expand Up @@ -27,6 +27,7 @@
var regId = /\{\{id}}/;
var regYtImg = /\{\{hqdefault}}/;
var regAmp = /^&/;
var regValidParam = /^[a-z0-9-_&=]+$/i;
var youtubeImg = protocol + '//img.youtube.com/vi/{{id}}/{{hqdefault}}.jpg';
var youtubeIframe = protocol + '//www.youtube.com/embed/{{id}}?autoplay=1';
var vimeoApi = protocol + '//vimeo.com/api/oembed.json?url=https%3A//vimeo.com/{{id}}';
Expand Down Expand Up @@ -64,6 +65,12 @@
var id = elem.getAttribute('data-vimeo');
var vimeoParams = elem.getAttribute('data-vimeoparams') || '';

elem.removeEventListener('click', embedVimeoIframe);

if (!id || !regValidParam.test(id) || (vimeoParams && !regValidParam.test(vimeoParams))) {
return;
}

if(vimeoParams && !regAmp.test(vimeoParams)){
vimeoParams = '&'+ vimeoParams;
}
Expand All @@ -74,7 +81,6 @@
'frameborder="0" allowfullscreen="" width="640" height="390"></iframe>'
;

elem.removeEventListener('click', embedVimeoIframe);
}

function embedYoutubeImg(id, elem){
Expand All @@ -89,6 +95,12 @@
var id = elem.getAttribute('data-youtube');
var youtubeParams = elem.getAttribute('data-ytparams') || '';

elem.removeEventListener('click', embedYoutubeIframe);

if (!id || !regValidParam.test(id) || (youtubeParams && !regValidParam.test(youtubeParams))) {
return;
}

if(youtubeParams && !regAmp.test(youtubeParams)){
youtubeParams = '&'+ youtubeParams;
}
Expand All @@ -98,8 +110,6 @@
elem.innerHTML = '<iframe src="' + (youtubeIframe.replace(regId, id)) + youtubeParams +'" ' +
'frameborder="0" allowfullscreen="" width="640" height="390"></iframe>'
;

elem.removeEventListener('click', embedYoutubeIframe);
}

document.addEventListener('lazybeforeunveil', function(e){
Expand Down
2 changes: 1 addition & 1 deletion plugins/video-embed/ls.video-embed.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 3720ab8

Please sign in to comment.