Compare commits

..

No commits in common. "e3aaec440ef589b1a40c3ecb1c2a4d612b4e78a9" and "a3c6b0b3a29cd3e204e572a9e423c1dc65182865" have entirely different histories.

2 changed files with 9 additions and 23 deletions

View File

@ -6,9 +6,9 @@ function appendMusicList(el, title, time)
const div = document.createElement("div") const div = document.createElement("div")
tr.setAttribute("id", "queue-item") tr.setAttribute("id", "queue-item")
tdtitle.setAttribute("class", "title")
tdtime.setAttribute("width", "50") tdtime.setAttribute("width", "50")
tdtime.innerHTML = time tdtime.innerHTML = time
div.setAttribute("class", "ellipsis")
div.setAttribute("colspan", "2") div.setAttribute("colspan", "2")
div.innerHTML = title div.innerHTML = title
@ -20,22 +20,15 @@ function appendMusicList(el, title, time)
return tr return tr
} }
// https://github.com/semibran/wrap-around/blob/master/index.js
function wrap(idx, len)
{
return idx >= 0 ? idx % len : (idx % len + len) % len
}
function audioPlayer() function audioPlayer()
{ {
const aPlay = document.getElementById("audioPlayer") const aPlay = document.getElementById("audioPlayer");
const aList = document.getElementById("audioPlaylist") const aList = document.getElementById("audioPlaylist");
const aTrack = document.getElementById("audioTrack") const aTrack = document.getElementById("audioTrack");
const aArtist = document.getElementById("audioArtist") const aArtist = document.getElementById("audioArtist");
const aCoverArt = document.getElementById("audioCoverArt") const aCoverArt = document.getElementById("audioCoverArt")
var currentSong = null var currentSong = null;
var aListLinks = []
function changeSong(idx, doplay=true) function changeSong(idx, doplay=true)
{ {
@ -44,11 +37,12 @@ function audioPlayer()
aPlay.play() aPlay.play()
return return
} }
const aListLinks = aList.getElementsByTagName("tr");
if (currentSong !== null) if (currentSong !== null)
{ {
aListLinks[currentSong].classList.remove("current-song"); aListLinks[currentSong].classList.remove("current-song");
} }
currentSong = wrap(idx, aListLinks.length) currentSong = idx % aListLinks.length
aListLinks[currentSong].classList.add("current-song"); aListLinks[currentSong].classList.add("current-song");
const aSelected = aListLinks[currentSong].getElementsByTagName("div")[0] const aSelected = aListLinks[currentSong].getElementsByTagName("div")[0]
@ -64,11 +58,10 @@ function audioPlayer()
musicList.forEach((value, index, array) => { musicList.forEach((value, index, array) => {
const el = appendMusicList(aList, value[1], value[3]) const el = appendMusicList(aList, value[1], value[3])
aListLinks.push(el)
el.addEventListener("click", () => { el.addEventListener("click", () => {
// el.preventDefault(); // el.preventDefault();
changeSong(index) changeSong(index)
}) });
}) })
aPlay.addEventListener("ended", function(){ aPlay.addEventListener("ended", function(){

View File

@ -52,7 +52,6 @@ article{
table { table {
border-collapse: collapse; border-collapse: collapse;
width: 100%; width: 100%;
table-layout: fixed;
} }
td { td {
@ -61,12 +60,6 @@ td {
border: 0px; border: 0px;
} }
.ellipsis {
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.current-song * { .current-song * {
background-color: white; background-color: white;
color: black; color: black;