no inline function calls pls
This commit is contained in:
parent
52e4810a1f
commit
396ab27aaa
GPG Key ID:
1688DA83D222D0B5
@ -24,11 +24,11 @@
|
|||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
<div class="pages flex-row">
|
<div class="pages flex-row">
|
||||||
<div class="paging btn" id="jump-first" onclick="showTracks(1)"><<</div>
|
<div class="paging btn" id="jump-first"><<</div>
|
||||||
<div class="paging btn inner" id="jump-prev" onclick="showTracks(pageNum - 1)"><</div>
|
<div class="paging btn inner" id="jump-prev"><</div>
|
||||||
<div class="paging bg" id="pagenum">0 / 0</div>
|
<div class="paging bg" id="pagenum">0 / 0</div>
|
||||||
<div class="paging btn inner" id="jump-next" onclick="showTracks(pageNum + 1)">></div>
|
<div class="paging btn inner" id="jump-next">></div>
|
||||||
<div class="paging btn" id="jump-last" onclick="showTracks(pages)">>></div>
|
<div class="paging btn" id="jump-last">>></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="player flex-row">
|
<div class="player flex-row">
|
||||||
<div id="playing">Nothing playing</div>
|
<div id="playing">Nothing playing</div>
|
||||||
|
|||||||
307
public/index.js
307
public/index.js
@ -1,156 +1,203 @@
|
|||||||
var table = document.querySelector('#ttable')
|
(function () {
|
||||||
var input = document.querySelector('#search')
|
var table = document.querySelector('#ttable')
|
||||||
var audio = document.querySelector('#player')
|
var input = document.querySelector('#search')
|
||||||
var playing = document.querySelector('#playing')
|
var audio = document.querySelector('#player')
|
||||||
|
var playing = document.querySelector('#playing')
|
||||||
|
|
||||||
var next = document.querySelector('#player-next')
|
var next = document.querySelector('#player-next')
|
||||||
var prev = document.querySelector('#player-prev')
|
var prev = document.querySelector('#player-prev')
|
||||||
|
|
||||||
var tableHead = '<tr> \
|
var tableHead = '<tr> \
|
||||||
<th class="small">#</th> \
|
<th class="small">#</th> \
|
||||||
<th>Track</th> \
|
<th>Track</th> \
|
||||||
<th>Artist</th> \
|
<th>Artist</th> \
|
||||||
<th>Album</th> \
|
<th>Album</th> \
|
||||||
<th class="small">Year</th> \
|
<th class="small">Year</th> \
|
||||||
<th class="small">Duration</th> \
|
<th class="small">Duration</th> \
|
||||||
</tr>'
|
</tr>'
|
||||||
var nowPlaying = 0
|
var nowPlaying = 0
|
||||||
|
|
||||||
var pageNum = 0
|
var pageNum = 0
|
||||||
var pages = 1
|
var pages = 1
|
||||||
var paginator = document.querySelector('.pages')
|
var paginator = document.querySelector('.pages')
|
||||||
var pageNumText = document.querySelector('.pages #pagenum')
|
var pageNumText = document.querySelector('.pages #pagenum')
|
||||||
|
|
||||||
window.mobilecheck = function() {
|
window.mobilecheck = function() {
|
||||||
var check = false;
|
var check = false;
|
||||||
(function(a){if(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0,4))) check = true;})(navigator.userAgent||navigator.vendor||window.opera);
|
(function(a){if(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0,4))) check = true;})(navigator.userAgent||navigator.vendor||window.opera);
|
||||||
return check;
|
return check;
|
||||||
};
|
};
|
||||||
|
|
||||||
// Seconds into HH:MM:SS
|
// Seconds into HH:MM:SS
|
||||||
function toHHMMSS (numbr) {
|
function toHHMMSS (numbr) {
|
||||||
let secNum = parseInt(numbr, 10) // don't forget the second param
|
let secNum = parseInt(numbr, 10) // don't forget the second param
|
||||||
let hours = Math.floor(secNum / 3600)
|
let hours = Math.floor(secNum / 3600)
|
||||||
let minutes = Math.floor((secNum - (hours * 3600)) / 60)
|
let minutes = Math.floor((secNum - (hours * 3600)) / 60)
|
||||||
let seconds = secNum - (hours * 3600) - (minutes * 60)
|
let seconds = secNum - (hours * 3600) - (minutes * 60)
|
||||||
|
|
||||||
if (hours < 10) hours = '0' + hours
|
if (hours < 10) hours = '0' + hours
|
||||||
if (minutes < 10) minutes = '0' + minutes
|
if (minutes < 10) minutes = '0' + minutes
|
||||||
if (seconds < 10) seconds = '0' + seconds
|
if (seconds < 10) seconds = '0' + seconds
|
||||||
|
|
||||||
let time = ''
|
let time = ''
|
||||||
if (parseInt(hours) > 0) {
|
if (parseInt(hours) > 0) {
|
||||||
time = hours + ':' + minutes + ':' + seconds
|
time = hours + ':' + minutes + ':' + seconds
|
||||||
} else {
|
} else {
|
||||||
time = minutes + ':' + seconds
|
time = minutes + ':' + seconds
|
||||||
}
|
|
||||||
return time
|
|
||||||
}
|
|
||||||
|
|
||||||
function httpGet (url, callback) {
|
|
||||||
return new Promise(function (resolve, reject) {
|
|
||||||
var xmlHttp = new XMLHttpRequest()
|
|
||||||
xmlHttp.onreadystatechange = function () {
|
|
||||||
if (xmlHttp.readyState === 4 && xmlHttp.status === 200) {
|
|
||||||
resolve(JSON.parse(xmlHttp.responseText))
|
|
||||||
} else if (xmlHttp.readyState === 4) {
|
|
||||||
reject(new Error(xmlHttp.status))
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
xmlHttp.open('GET', url, true)
|
return time
|
||||||
xmlHttp.send(null)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function shortTitle (title, artist) {
|
|
||||||
if (!artist) return title
|
|
||||||
return artist + ' - ' + title
|
|
||||||
}
|
|
||||||
|
|
||||||
function constructList (tracks) {
|
|
||||||
table.innerHTML = tableHead
|
|
||||||
for (let i in tracks) {
|
|
||||||
let track = tracks[i]
|
|
||||||
let title = window.mobilecheck() ? shortTitle(track.title, track.artist) : track.title
|
|
||||||
let htmlAdder = '<tr onclick="play(' + track.id + ')">'
|
|
||||||
htmlAdder += '<td>' + track.id + '</td>'
|
|
||||||
htmlAdder += '<td>' + title + '</td>'
|
|
||||||
htmlAdder += '<td>' + (track.artist || '') + '</td>'
|
|
||||||
htmlAdder += '<td>' + (track.album || '') + '</td>'
|
|
||||||
htmlAdder += '<td>' + (track.year || '') + '</td>'
|
|
||||||
htmlAdder += '<td>' + toHHMMSS(track.duration) + '</td>'
|
|
||||||
htmlAdder += '</tr>'
|
|
||||||
table.innerHTML += htmlAdder
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function updatePaging () {
|
|
||||||
if (input.value.trim() === '') {
|
|
||||||
paginator.style.display = 'flex'
|
|
||||||
} else {
|
|
||||||
paginator.style.display = 'none'
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pageNumText.innerHTML = pageNum + ' / ' + pages
|
function httpGet (url, callback) {
|
||||||
}
|
return new Promise(function (resolve, reject) {
|
||||||
|
var xmlHttp = new XMLHttpRequest()
|
||||||
|
xmlHttp.onreadystatechange = function () {
|
||||||
|
if (xmlHttp.readyState === 4 && xmlHttp.status === 200) {
|
||||||
|
resolve(JSON.parse(xmlHttp.responseText))
|
||||||
|
} else if (xmlHttp.readyState === 4) {
|
||||||
|
reject(new Error(xmlHttp.status))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
xmlHttp.open('GET', url, true)
|
||||||
|
xmlHttp.send(null)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
function showTracks (page) {
|
function shortTitle (title, artist) {
|
||||||
if (page > pages) return
|
if (!artist) return title
|
||||||
if (page < 1) return
|
return artist + ' - ' + title
|
||||||
|
}
|
||||||
|
|
||||||
httpGet('/api/tracks?page=' + page).then(function (data) {
|
function constructList (tracks) {
|
||||||
pageNum = page
|
table.innerHTML = tableHead
|
||||||
pages = data.pageCount
|
for (let i in tracks) {
|
||||||
constructList(data.tracks)
|
let track = tracks[i]
|
||||||
|
let title = window.mobilecheck() ? shortTitle(track.title, track.artist) : track.title
|
||||||
|
let htmlAdder = '<tr class="track">'
|
||||||
|
htmlAdder += '<td>' + track.id + '</td>'
|
||||||
|
htmlAdder += '<td>' + title + '</td>'
|
||||||
|
htmlAdder += '<td>' + (track.artist || '') + '</td>'
|
||||||
|
htmlAdder += '<td>' + (track.album || '') + '</td>'
|
||||||
|
htmlAdder += '<td>' + (track.year || '') + '</td>'
|
||||||
|
htmlAdder += '<td>' + toHHMMSS(track.duration) + '</td>'
|
||||||
|
htmlAdder += '</tr>'
|
||||||
|
table.innerHTML += htmlAdder
|
||||||
|
}
|
||||||
|
|
||||||
|
let trid = document.querySelectorAll('table .track')
|
||||||
|
for (let e in trid) {
|
||||||
|
let trelem = trid[e]
|
||||||
|
if (!(trelem instanceof Element)) continue
|
||||||
|
let tride = trelem.querySelector('td')
|
||||||
|
let id = parseInt(tride.innerHTML)
|
||||||
|
|
||||||
|
trelem.addEventListener('click', function (e) {
|
||||||
|
play(id)
|
||||||
|
}, false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function updatePaging () {
|
||||||
|
if (input.value.trim() === '') {
|
||||||
|
paginator.style.display = 'flex'
|
||||||
|
} else {
|
||||||
|
paginator.style.display = 'none'
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
pageNumText.innerHTML = pageNum + ' / ' + pages
|
||||||
|
}
|
||||||
|
|
||||||
|
function showTracks (page) {
|
||||||
|
if (page > pages) return
|
||||||
|
if (page < 1) return
|
||||||
|
|
||||||
|
httpGet('/api/tracks?page=' + page).then(function (data) {
|
||||||
|
pageNum = page
|
||||||
|
pages = data.pageCount
|
||||||
|
constructList(data.tracks)
|
||||||
|
updatePaging()
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
function search (query) {
|
||||||
updatePaging()
|
updatePaging()
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function search (query) {
|
if (query.trim() === '') {
|
||||||
updatePaging()
|
return showTracks(pageNum)
|
||||||
|
}
|
||||||
|
|
||||||
if (query.trim() === '') {
|
httpGet('/api/tracks/search?string=' + query).then(function (data) {
|
||||||
return showTracks(pageNum)
|
constructList(data)
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
httpGet('/api/tracks/search?string=' + query).then(function (data) {
|
function play (id) {
|
||||||
constructList(data)
|
if (id < 1) return
|
||||||
|
httpGet('/api/track/' + id).then(function (data) {
|
||||||
|
let title = shortTitle(data.title, data.artist)
|
||||||
|
playing.innerHTML = title
|
||||||
|
document.title = title
|
||||||
|
|
||||||
|
audio.src = '/api/serve/by-id/' + id
|
||||||
|
audio.play()
|
||||||
|
|
||||||
|
nowPlaying = id
|
||||||
|
}, function (e) {
|
||||||
|
console.log(e)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
input.addEventListener('keyup', function (e) {
|
||||||
|
e.which === 13 && search(input.value)
|
||||||
|
}, false)
|
||||||
|
|
||||||
|
audio.addEventListener('ended', function (e) {
|
||||||
|
play(nowPlaying + 1)
|
||||||
})
|
})
|
||||||
}
|
|
||||||
|
|
||||||
function play (id) {
|
next.addEventListener('click', function (e) {
|
||||||
if (id < 1) return
|
play(nowPlaying + 1)
|
||||||
httpGet('/api/track/' + id).then(function (data) {
|
|
||||||
let title = shortTitle(data.title, data.artist)
|
|
||||||
playing.innerHTML = title
|
|
||||||
document.title = title
|
|
||||||
|
|
||||||
audio.src = '/api/serve/by-id/' + id
|
|
||||||
audio.play()
|
|
||||||
|
|
||||||
nowPlaying = id
|
|
||||||
}, function (e) {
|
|
||||||
console.log(e)
|
|
||||||
})
|
})
|
||||||
}
|
|
||||||
|
|
||||||
input.addEventListener('keyup', function (e) {
|
prev.addEventListener('click', function (e) {
|
||||||
e.which === 13 && search(input.value)
|
play(nowPlaying - 1)
|
||||||
}, false)
|
})
|
||||||
|
|
||||||
audio.addEventListener('ended', function (e) {
|
document.getElementById('jump-first').addEventListener('click', function (e) {
|
||||||
play(nowPlaying + 1)
|
showTracks(1)
|
||||||
})
|
}, false)
|
||||||
|
|
||||||
next.addEventListener('click', function (e) {
|
document.getElementById('jump-prev').addEventListener('click', function (e) {
|
||||||
play(nowPlaying + 1)
|
showTracks(pageNum - 1)
|
||||||
})
|
}, false)
|
||||||
|
|
||||||
prev.addEventListener('click', function (e) {
|
document.getElementById('jump-next').addEventListener('click', function (e) {
|
||||||
play(nowPlaying - 1)
|
showTracks(pageNum + 1)
|
||||||
})
|
}, false)
|
||||||
|
|
||||||
showTracks(1)
|
document.getElementById('jump-last').addEventListener('click', function (e) {
|
||||||
|
showTracks(pages)
|
||||||
|
}, false)
|
||||||
|
|
||||||
window.play = play
|
showTracks(1)
|
||||||
|
|
||||||
|
function handleHash (hash) {
|
||||||
|
if (hash.indexOf('#') === 0) hash = hash.substr(1)
|
||||||
|
if (hash.length === 0) return
|
||||||
|
|
||||||
|
window.location.hash = ''
|
||||||
|
|
||||||
|
if (hash.indexOf('track-') === 0) {
|
||||||
|
let trackNr = parseInt(hash.substr(6))
|
||||||
|
if (!isNaN(trackNr)) return play(trackNr)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
window.addEventListener('hashchange', function (e) {
|
||||||
|
e.preventDefault()
|
||||||
|
handleHash(window.location.hash)
|
||||||
|
}, false)
|
||||||
|
|
||||||
|
handleHash(window.location.hash)
|
||||||
|
})()
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user