junior/HomeAudio
junior/HomeAudio
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: junior:7ed669b4ba8accfcde909d404c3bfc6d464c58ab
Branches Tags
junior:master
...
compare: junior:2f7735f669b3b1019e55a7c18b9cfc2af461a9d7
Branches Tags
junior:master

3 Commits
7ed669b4ba ... 2f7735f669

Author SHA1 Message Date
Junior
2f7735f669 Rearrange order of operations in skipSong() to make button skinning work better, and get the new song in the subsequent listsongs call 2024-06-01 12:55:48 -04:00
Junior
7ddbc11d27 Remove superfluous getVolume in document.ready 2024-06-01 12:53:16 -04:00
Junior
83925c2705 Remove async calls (and the need for them in the first place) 2024-06-01 12:42:43 -04:00
1 changed files with 11 additions and 13 deletions
Show Stats Expand all files Collapse all files

24
js/minimal.js
View File

@ -15,12 +15,6 @@ $(document).ready(function() {
}
});
getVolumeRange();
$('#volume_slider').slider({ animate: "fast", max: maxVolume, min: minVolume, step: 2 });
$('#volume_slider').slider({
change: function(event, ui) { if ( !volFromServer ) { setVolume(); } volFromServer = false; }
});
$('#max_btn').click(function() { setSliderVolume(maxVolume); });
$('#min_btn').click(function() { setSliderVolume(minVolume); });
//$('#skipsong_btn').click(function() { skipSong($(this)); });
//$('#skipsong_playing_btn').click(function() { skipSong($(this)); });
$('.skipsong_btn').click(function() { skipSong($(this)); });
@ -60,7 +54,6 @@ $(document).ready(function() {
allowPageScroll: "vertical"
});
updateQueueSelects();
getVolume();
toggleMute($(this), 'show');
getSongList();
getQueueTarget();
@ -313,11 +306,16 @@ function dropJukeboxSong(id) {
function getVolumeRange() {
$.ajax({
url: 'ajax/ajax_getvolrange.php',
async: false,
dataType: 'json',
success: function(data, stat, jqo) {
maxVolume = data.max;
minVolume = data.min;
$('#volume_slider').slider({ animate: "fast", max: maxVolume, min: minVolume, step: 2 });
$('#volume_slider').slider({
change: function(event, ui) { if ( !volFromServer ) { setVolume(); } volFromServer = false; }
});
$('#max_btn').click(function() { setSliderVolume(maxVolume); });
$('#min_btn').click(function() { setSliderVolume(minVolume); });
}
});
}
@ -356,12 +354,14 @@ function skipSong (callingElement) {
callingElement.blur();
if ( gettingJukeboxList || gettingSongList ) return false;
callingElement.addClass("buttonactive");
console.log("Skipping song");
$.ajax({
url: 'ajax/ajax_skipsong.php',
async: false,
success: function (data, stat, jqo) {
callingElement.removeClass("buttonactive");
getSongList();
setTimeout(function() {
callingElement.removeClass("buttonactive");
getSongList();
}, 250);
},
error: function(jqo, stat, err) {
callingElement.removeClass("buttonactive");
@ -391,7 +391,6 @@ function dropSong (callingElement) {
callingElement.addClass("buttonactive");
$.ajax({
url: 'ajax/ajax_dropsong.php',
async: false,
success: function (data, stat, jqo) {
callingElement.removeClass("buttonactive");
getSongList();
@ -407,7 +406,6 @@ function changeQueue () {
$.ajax({
url: 'ajax/ajax_changequeue.php',
data: {newid: qid},
async: false,
success: function (data, stat, jqo) {
getSongList();
}