From 6e8dc3a9fb96dc9986ef22a98b20599a7c5e1871 Mon Sep 17 00:00:00 2001 From: Evert Prants Date: Wed, 10 Oct 2018 12:53:05 +0300 Subject: [PATCH] queue, ctxmenu --- public/index.css | 34 +++++++++ public/index.html | 12 +++- public/index.js | 180 ++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 202 insertions(+), 24 deletions(-) diff --git a/public/index.css b/public/index.css index ff8da8b..5e0ef4a 100644 --- a/public/index.css +++ b/public/index.css @@ -151,6 +151,40 @@ tr:nth-child(even) { width: 0%; background-color: #00b7ff; } +.ctx-menu { + position: absolute; + background-color: #0c2233; + border: 2px solid #031421; +} +.ctx-menu ul { + list-style: none; + display: block; +} +.ctx-menu ul li { + display: block; +} +.ctx-item { + padding: 10px; + cursor: pointer; + display: block; +} +.ctx-item:nth-child(even) { + background-color: #0b1f2f; +} +.ctx-item:hover { + background-color: #0c273c; +} +.playing-flex { + display: flex; + flex-direction: row; +} +.queue-tag { + padding: 10px; + background-color: #007d32; + text-transform: uppercase; + font-weight: bold; + border-right: 5px solid #005c25; +} @media only screen and (max-width: 600px) { tr td:nth-child(1), th:nth-child(1) { display: none; diff --git a/public/index.html b/public/index.html index df175ba..0f4856e 100644 --- a/public/index.html +++ b/public/index.html @@ -31,7 +31,10 @@
>>
-
Nothing playing
+
+ +
Nothing playing
+
@@ -50,6 +53,13 @@
+ diff --git a/public/index.js b/public/index.js index 1f0b697..22ebbbf 100644 --- a/public/index.js +++ b/public/index.js @@ -4,6 +4,8 @@ var audio = document.getElementById('player') var playing = document.getElementById('playing') + var menu = document.getElementById('menu') + var tableHead = ' \ # \ Track \ @@ -24,11 +26,15 @@ var pagePrev = 0 var pagesPrev = 0 + // Queueing + var queue = [] + var qTag = document.getElementById('queue') + window.mobilecheck = function() { 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); - return check; - }; + return check + } // Seconds into HH:MM:SS function toHHMMSS (numbr) { @@ -70,6 +76,120 @@ return artist + ' - ' + title } + 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) + } + } + + function clickInsideElement (e, className) { + var el = e.srcElement || e.target + + if (el.classList.contains(className)) { + return el + } else { + while (el = el.parentNode) { + if (el.classList && el.classList.contains(className)) { + return el + } + } + } + + return false + } + + function getPosition(e) { + var posx = 0 + var posy = 0 + + if (!e) var e = window.event + + if (e.pageX || e.pageY) { + posx = e.pageX + posy = e.pageY + } else if (e.clientX || e.clientY) { + posx = e.clientX + document.body.scrollLeft + + document.documentElement.scrollLeft + posy = e.clientY + document.body.scrollTop + + document.documentElement.scrollTop + } + + return { + x: posx, + y: posy + } + } + + function positionMenu(e) { + clickCoords = getPosition(e) + clickCoordsX = clickCoords.x + clickCoordsY = clickCoords.y + + menuWidth = menu.offsetWidth + 4 + menuHeight = menu.offsetHeight + 4 + + windowWidth = window.innerWidth + windowHeight = window.innerHeight + + if ( (windowWidth - clickCoordsX) < menuWidth ) { + menu.style.left = windowWidth - menuWidth + 'px' + } else { + menu.style.left = clickCoordsX + 'px' + } + + if ( (windowHeight - clickCoordsY) < menuHeight ) { + menu.style.top = windowHeight - menuHeight + 'px' + } else { + menu.style.top = clickCoordsY + 'px' + } + } + + var ctxState = 0 + function ctxHide () { + ctxState = 0 + menu.style.display = 'none' + } + + function updateQT (q) { + if (q) { + qTag.style.display = 'block' + var cnt = '+' + queue.length + if (queue.length === 0) cnt = '%' + qTag.innerHTML = 'Queue ' + cnt + return + } + qTag.style.display = 'none' + } + + function ctxHandle (el) { + if (ctxState === 0) return + let dt = el.getAttribute("data-action") + switch (dt) { + case 'play': + play(ctxState) + break + case 'queue': + queue.push(ctxState) + break + case 'download': + break + } + ctxHide() + updateQT(qTag.style.display === 'block') + } + + function ctxTrack (xid, ev) { + positionMenu(ev) + menu.style.display = 'block' + ctxState = xid + } + function constructList (tracks) { table.innerHTML = tableHead for (let i in tracks) { @@ -96,6 +216,11 @@ trelem.addEventListener('click', function (e) { play(id) }, false) + + trelem.addEventListener('contextmenu', function (e) { + e.preventDefault() + ctxTrack(id, e) + }, false) } } @@ -145,8 +270,8 @@ }) } - function play (id) { - if (id < 1) return + function play (id, q) { + if (id < 1) return playNext() httpGet('/api/track/' + id).then(function (data) { let title = shortTitle(data.title, data.artist) playing.innerHTML = title @@ -155,27 +280,30 @@ audio.src = '/api/serve/by-id/' + id audio.play() + updateQT(q) + nowPlaying = id }, function (e) { console.log(e) }) } + function playNext () { + if (queue.length === 0) return play(nowPlaying + 1) + play(queue.shift(), true) + } + input.addEventListener('keyup', function (e) { e.which === 13 && showTracks(input.value.trim() === '' ? (pagePrev !== 0 ? pagePrev : 1) : 1) }, false) - audio.addEventListener('ended', function (e) { - play(nowPlaying + 1) - }) + audio.addEventListener('ended', playNext, false) - document.getElementById('player-next').addEventListener('click', function (e) { - play(nowPlaying + 1) - }) + document.getElementById('player-next').addEventListener('click', playNext, false) document.getElementById('player-prev').addEventListener('click', function (e) { play(nowPlaying - 1) - }) + }, false) document.getElementById('jump-first').addEventListener('click', function (e) { showTracks(1) @@ -193,23 +321,29 @@ showTracks(pages) }, false) - 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) + window.addEventListener('resize', function (e) { + ctxHide() + }, false) + + document.addEventListener('click', function(e) { + var clickeElIsLink = clickInsideElement(e, 'ctx-item') + + if (clickeElIsLink) { + e.preventDefault() + ctxHandle(clickeElIsLink) + } else { + var button = e.which || e.button + if ( button === 1 ) { + ctxHide() + } + } + }) + showTracks(1) handleHash(window.location.hash) })()