Skip to content

Commit

Permalink
Update media with previous JS changes
Browse files Browse the repository at this point in the history
  • Loading branch information
richard67 committed Sep 12, 2022
1 parent fb8619d commit 5d1f248
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 15 deletions.
18 changes: 11 additions & 7 deletions src/media/js/rfvideo-es5.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
(function () {
'use strict';

function selChangeQ(elSelect, elVideoDiv, elPlaylistDiv, elVideo, sourceGroups) {
/**
* @copyright (C) 2022 Richard Fath <https://www.richard-fath.de>
* @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 === '') {
Expand Down Expand Up @@ -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');
Expand All @@ -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],
Expand All @@ -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);
});
}

Expand Down
18 changes: 11 additions & 7 deletions src/media/js/rfvideo.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
function selChangeQ(elSelect, elVideoDiv, elPlaylistDiv, elVideo, sourceGroups) {
/**
* @copyright (C) 2022 Richard Fath <https://www.richard-fath.de>
* @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 === '') {
Expand Down Expand Up @@ -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');
Expand All @@ -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],
Expand All @@ -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);
});
}

Expand Down
2 changes: 1 addition & 1 deletion src/media/js/rfvideo.min.js

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

Binary file modified src/media/js/rfvideo.min.js.gz
Binary file not shown.

0 comments on commit 5d1f248

Please sign in to comment.