mirror of
https://github.com/SuperBFG7/ympd
synced 2024-06-16 18:19:56 +00:00
Merge branch 'devel' of https://github.com/jcorporation/myMPD into devel
This commit is contained in:
commit
83a3933056
|
@ -293,7 +293,7 @@ function appInit() {
|
||||||
|
|
||||||
domCache.progressBar.value = 0;
|
domCache.progressBar.value = 0;
|
||||||
domCache.progressBar.addEventListener('change', function(event) {
|
domCache.progressBar.addEventListener('change', function(event) {
|
||||||
if(current_song && current_song.currentSongId >= 0) {
|
if (current_song && current_song.currentSongId >= 0) {
|
||||||
var seekVal = Math.ceil(current_song.totalTime * (domCache.progressBar.value / 100));
|
var seekVal = Math.ceil(current_song.totalTime * (domCache.progressBar.value / 100));
|
||||||
sendAPI({"cmd": "MPD_API_SET_SEEK", "data": {"songid":current_song.currentSongId,"seek": seekVal}});
|
sendAPI({"cmd": "MPD_API_SET_SEEK", "data": {"songid":current_song.currentSongId,"seek": seekVal}});
|
||||||
}
|
}
|
||||||
|
@ -409,7 +409,7 @@ function appInit() {
|
||||||
document.getElementById(event.dataTransfer.getData('Text')).remove();
|
document.getElementById(event.dataTransfer.getData('Text')).remove();
|
||||||
dragEl.style.display = '';
|
dragEl.style.display = '';
|
||||||
queueBody.insertBefore(dragEl, event.target.parentNode);
|
queueBody.insertBefore(dragEl, event.target.parentNode);
|
||||||
var tr = queueBody.getElementsByTagName('tr');
|
var tr = queueBody.querySelectorAll('.dragover');
|
||||||
var trLen = tr.length;
|
var trLen = tr.length;
|
||||||
for (var i = 0; i < trLen; i++) {
|
for (var i = 0; i < trLen; i++) {
|
||||||
tr[i].classList.remove('dragover');
|
tr[i].classList.remove('dragover');
|
||||||
|
|
10
mkrelease.sh
10
mkrelease.sh
|
@ -44,8 +44,8 @@ sudo sed -i -e 's/mpd\.css/mpd\.min\.css/' -e 's/player\.js/player\.min\.js/' /u
|
||||||
sudo sed -i -e 's/mpd\.css/mpd\.min\.css/' -e 's/mpd\.js/mpd\.min\.js/' -e 's/player\.js/player\.min\.js/' /usr/share/mympd/htdocs/sw.min.js
|
sudo sed -i -e 's/mpd\.css/mpd\.min\.css/' -e 's/mpd\.js/mpd\.min\.js/' -e 's/player\.js/player\.min\.js/' /usr/share/mympd/htdocs/sw.min.js
|
||||||
sudo sed -i -e 's/\/sw\.js/\/sw\.min\.js/' /usr/share/mympd/htdocs/js/mpd.min.js
|
sudo sed -i -e 's/\/sw\.js/\/sw\.min\.js/' /usr/share/mympd/htdocs/js/mpd.min.js
|
||||||
echo "Minifying html"
|
echo "Minifying html"
|
||||||
perl -i -pe 's/^\s*//gm; s/\s*$//gm' /usr/share/mympd/htdocs/index.html
|
sudo perl -i -pe 's/^\s*//gm; s/\s*$//gm' /usr/share/mympd/htdocs/index.html
|
||||||
perl -i -pe 's/^\s*//gm; s/\s*$//gm' /usr/share/mympd/htdocs/player.html
|
sudo perl -i -pe 's/^\s*//gm; s/\s*$//gm' /usr/share/mympd/htdocs/player.html
|
||||||
|
|
||||||
echo "Fixing ownership of /var/lib/mympd"
|
echo "Fixing ownership of /var/lib/mympd"
|
||||||
sudo chown nobody /var/lib/mympd
|
sudo chown nobody /var/lib/mympd
|
||||||
|
@ -65,9 +65,9 @@ then
|
||||||
if [ contrib/mympd.service -nt /etc/systemd/system/mympd.service ]
|
if [ contrib/mympd.service -nt /etc/systemd/system/mympd.service ]
|
||||||
then
|
then
|
||||||
sudo cp -v contrib/mympd.service /etc/systemd/system/
|
sudo cp -v contrib/mympd.service /etc/systemd/system/
|
||||||
systemctl daemon-reload
|
sudo systemctl daemon-reload
|
||||||
fi
|
fi
|
||||||
systemctl enable mympd
|
sudo systemctl enable mympd
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -d /etc/mympd/ssl ]
|
if [ -d /etc/mympd/ssl ]
|
||||||
|
@ -75,7 +75,7 @@ then
|
||||||
echo "Certificates already created"
|
echo "Certificates already created"
|
||||||
else
|
else
|
||||||
echo "Creating certificates"
|
echo "Creating certificates"
|
||||||
contrib/crcert.sh
|
sudo contrib/crcert.sh
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "myMPD installed"
|
echo "myMPD installed"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user