From 5d1f248b332579abcca52d7c5dc02797dc80d2aa Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Mon, 12 Sep 2022 10:38:52 +0200 Subject: [PATCH] Update media with previous JS changes --- src/media/js/rfvideo-es5.js | 18 +++++++++++------- src/media/js/rfvideo.js | 18 +++++++++++------- src/media/js/rfvideo.min.js | 2 +- src/media/js/rfvideo.min.js.gz | Bin 806 -> 810 bytes 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/src/media/js/rfvideo-es5.js b/src/media/js/rfvideo-es5.js index 1577703..58ebc6d 100644 --- a/src/media/js/rfvideo-es5.js +++ b/src/media/js/rfvideo-es5.js @@ -1,7 +1,11 @@ (function () { 'use strict'; - function selChangeQ(elSelect, elVideoDiv, elPlaylistDiv, elVideo, sourceGroups) { + /** + * @copyright (C) 2022 Richard Fath + * @license GNU General Public License version 2 or later; see LICENSE.txt + */ + function sourceSelectChanged(elSelect, elVideoDiv, elPlaylistDiv, elVideo, sourceGroups) { var vidExt = elVideo.currentSrc.substr(elVideo.currentSrc.lastIndexOf('.')); if (vidExt === '') { @@ -45,7 +49,7 @@ allVideoPlayerDivs.forEach(function (videoPlayerDiv) { var myVideoDiv = videoPlayerDiv.querySelector('.rfvideo'); var myPlaylistDiv = videoPlayerDiv.querySelector('.rfvideoplaylist'); - var mySelectQ = videoPlayerDiv.getElementsByTagName('select')[0]; + var mySourceSelect = videoPlayerDiv.getElementsByTagName('select')[0]; var myVideo = videoPlayerDiv.getElementsByTagName('video')[0]; var myStatus = videoPlayerDiv.querySelector('.rfvideostatus'); var myPlaylistItems = videoPlayerDiv.getElementsByTagName('li'); @@ -65,11 +69,11 @@ _loop(i); } - if (mySelectQ) { + if (mySourceSelect) { var mySourceGroups = []; - for (var _i = 0; _i < mySelectQ.length; ++_i) { - var opts = mySelectQ.options[_i].value.split(';'); + for (var _i = 0; _i < mySourceSelect.length; ++_i) { + var opts = mySourceSelect.options[_i].value.split(';'); var group = { 'suffix': opts[0], @@ -81,8 +85,8 @@ mySourceGroups[_i] = group; } - mySelectQ.addEventListener('change', function () { - selChangeQ(mySelectQ, myVideoDiv, myPlaylistDiv, myVideo, mySourceGroups); + mySourceSelect.addEventListener('change', function () { + sourceSelectChanged(mySourceSelect, myVideoDiv, myPlaylistDiv, myVideo, mySourceGroups); }); } diff --git a/src/media/js/rfvideo.js b/src/media/js/rfvideo.js index 7830ed3..fdcfe9c 100644 --- a/src/media/js/rfvideo.js +++ b/src/media/js/rfvideo.js @@ -1,4 +1,8 @@ -function selChangeQ(elSelect, elVideoDiv, elPlaylistDiv, elVideo, sourceGroups) { +/** + * @copyright (C) 2022 Richard Fath + * @license GNU General Public License version 2 or later; see LICENSE.txt + */ +function sourceSelectChanged(elSelect, elVideoDiv, elPlaylistDiv, elVideo, sourceGroups) { const vidExt = elVideo.currentSrc.substr(elVideo.currentSrc.lastIndexOf('.')); if (vidExt === '') { @@ -42,7 +46,7 @@ const allVideoPlayerDivs = document.querySelectorAll('div.rfvideoplayer'); allVideoPlayerDivs.forEach(videoPlayerDiv => { const myVideoDiv = videoPlayerDiv.querySelector('.rfvideo'); const myPlaylistDiv = videoPlayerDiv.querySelector('.rfvideoplaylist'); - const mySelectQ = videoPlayerDiv.getElementsByTagName('select')[0]; + const mySourceSelect = videoPlayerDiv.getElementsByTagName('select')[0]; const myVideo = videoPlayerDiv.getElementsByTagName('video')[0]; const myStatus = videoPlayerDiv.querySelector('.rfvideostatus'); const myPlaylistItems = videoPlayerDiv.getElementsByTagName('li'); @@ -58,11 +62,11 @@ allVideoPlayerDivs.forEach(videoPlayerDiv => { }); } - if (mySelectQ) { + if (mySourceSelect) { let mySourceGroups = []; - for (let i = 0; i < mySelectQ.length; ++i) { - const opts = mySelectQ.options[i].value.split(';'); + for (let i = 0; i < mySourceSelect.length; ++i) { + const opts = mySourceSelect.options[i].value.split(';'); let group = { 'suffix': opts[0], 'height': opts[1], @@ -73,8 +77,8 @@ allVideoPlayerDivs.forEach(videoPlayerDiv => { mySourceGroups[i] = group; } - mySelectQ.addEventListener('change', function () { - selChangeQ(mySelectQ, myVideoDiv, myPlaylistDiv, myVideo, mySourceGroups); + mySourceSelect.addEventListener('change', function () { + sourceSelectChanged(mySourceSelect, myVideoDiv, myPlaylistDiv, myVideo, mySourceGroups); }); } diff --git a/src/media/js/rfvideo.min.js b/src/media/js/rfvideo.min.js index 4910d35..9021173 100644 --- a/src/media/js/rfvideo.min.js +++ b/src/media/js/rfvideo.min.js @@ -1 +1 @@ -function selChangeQ(e,t,s,n,i){const a=n.currentSrc.substr(n.currentSrc.lastIndexOf("."));if(""===a)return;n.pause();let l=i[e.getAttribute("data-selected")].suffix,r=i[e.options.selectedIndex].suffix;t.classList.remove("rfvideo"+l),s.classList.remove("rfvideoplaylist"+l),t.classList.add("rfvideo"+r),s.classList.add("rfvideoplaylist"+r),n.width=i[e.options.selectedIndex].width,n.height=i[e.options.selectedIndex].height,n.poster="/"+i[e.options.selectedIndex].image,i[e.options.selectedIndex].sources.forEach((e=>{if(e.substr(e.lastIndexOf("."))===a)return n.src="/"+e,!1})),e.setAttribute("data-selected",e.options.selectedIndex),n.load()}function seek(e,t){e.currentTime=t.toFixed(1),e.play()}function setstatus(e,t){e.innerHTML=t}function clearstatus(e,t){e.innerHTML===t&&(e.innerHTML="")}const allVideoPlayerDivs=document.querySelectorAll("div.rfvideoplayer");allVideoPlayerDivs.forEach((e=>{const t=e.querySelector(".rfvideo"),s=e.querySelector(".rfvideoplaylist"),n=e.getElementsByTagName("select")[0],i=e.getElementsByTagName("video")[0],a=e.querySelector(".rfvideostatus"),l=e.getElementsByTagName("li"),r=Joomla.Text._("MOD_RFVIDEO_LOADING").replace("…","…"),o=Joomla.Text._("MOD_RFVIDEO_SEEKING").replace("…","…");for(let e=0;e{if(e.substr(e.lastIndexOf("."))===a)return n.src="/"+e,!1})),e.setAttribute("data-selected",e.options.selectedIndex),n.load()}function seek(e,t){e.currentTime=t.toFixed(1),e.play()}function setstatus(e,t){e.innerHTML=t}function clearstatus(e,t){e.innerHTML===t&&(e.innerHTML="")}const allVideoPlayerDivs=document.querySelectorAll("div.rfvideoplayer");allVideoPlayerDivs.forEach((e=>{const t=e.querySelector(".rfvideo"),s=e.querySelector(".rfvideoplaylist"),n=e.getElementsByTagName("select")[0],i=e.getElementsByTagName("video")[0],a=e.querySelector(".rfvideostatus"),l=e.getElementsByTagName("li"),r=Joomla.Text._("MOD_RFVIDEO_LOADING").replace("…","…"),o=Joomla.Text._("MOD_RFVIDEO_SEEKING").replace("…","…");for(let e=0;e z6$gnjNiVHfmcb`HFxsoKjuAXw$5N&GYr@F4zB!Zd+*h!;8gZtW5QU`|rnNRA0@l$N zUd>FMfQ!Nb9yo0WpvHhFh|zwn5jd+1npdgO0u>WO$}}3;g^Ue0%(CL7)_^A68dIPu zNkh7@2~~t?m=j+d&20sN9XcUX_xa432S?u<+$N8ystuC3O|p6T%s?Qo?rnvWeVQ8p z0ViO`6WoVv5d@uugb+3RnH}zd+o>6Y+*hrp-${)^?3;4JIq3IGY89-z3NKr^(ZmC< zQY;%4Ab&bq2_Y$RPZMQ_l3XSiOvS}&^yEc=yKFwOgtfJ9>=ZOA3}<#h&OFNLaqdVKQ>V`BAae&@dA9{)*cA)eZK(p4zyDXCL` z)es-r;R*4?Il8@_s|`~?WTJSB7NBi*2+pxy+Wv$KLp_RqJ!i6HDFxbF8q{s%!pW#)O=fPP)TJEt7@ zF;0rZLl93@cLNx9+`=@aD4JRC&*?A^K9EH?E1fOxnB;4Jaj|UdYvqh=2501LKRT_N;-G?dNaq1QL$g1jo|^_QW1TnfiDqjW9cZ^fzrqStoicip}DPkeXz9sd#E z{70;W_NqIW@&;(@u|@WV2GS}Icpu{3HMtFXz2_-6GG;=#i}2o9w0``f=t|@BbZygZ oZjyb$Ir4>;{~Mgm^dfjubl4l3H*a^^CYGM!Uwwth9|s5k04BMM6951J literal 806 zcmV+>1KIo^iwFP!000021Fcn2ZxcBX{wu`~k*)d+?}?RQw=^%f;Sy!-NLw zwDPsyLwtAf{#4`Is&rstmz~zw>+#J$jEUu)_?`Qld;F2YLOinbq^nTYQ(~vS)(~&c zo4i6ibdIvObG0D~h)fg@5w^?U#z76+cvSqA_DFf%xA)?sn(Ahx`VKO^^!oO~j6awu zb)_vn6N6_%X*;d%qGcn~9k8t;g>#)i&eC<%e}^!2MqR)Ss!Pt^pB-KPd;Iz2sDE~O zdUkkp^5HELG>w!&Nlv{9IA>=ClkC55-w7b>0yyvY|M>|(L1pH7*?@jlz)Pnb_%Tk3 z{e2MkRd)jzc4T3iQWVXs_vdt(2OmfxoR!X&S4{GizPMO4^0jhCGJ|8%HgbG)zoCiL z2q9>AmNa=@ELw_#;XPj@zWCCw`QnOiqE&o1Py-yQxp6fO;LKU%tYGbGwR+Jm#TO}e zvRxr`J{Zbo@zC)(sUWWkI{rD7cT3>~%_yY>{4cRAfZ(-V`p0r_-iaTRzkfb_^L$td zZHA8kcCI_z}K3%5IL<4a%hKXo*Ui1h~m0Q?<`_y7O^