Compare commits
No commits in common. "2f7735f669b3b1019e55a7c18b9cfc2af461a9d7" and "7ed669b4ba8accfcde909d404c3bfc6d464c58ab" have entirely different histories.
2f7735f669
...
7ed669b4ba
|
@ -15,6 +15,12 @@ $(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)); });
|
||||
|
@ -54,6 +60,7 @@ $(document).ready(function() {
|
|||
allowPageScroll: "vertical"
|
||||
});
|
||||
updateQueueSelects();
|
||||
getVolume();
|
||||
toggleMute($(this), 'show');
|
||||
getSongList();
|
||||
getQueueTarget();
|
||||
|
@ -306,16 +313,11 @@ 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); });
|
||||
}
|
||||
});
|
||||
}
|
||||
|
@ -354,14 +356,12 @@ 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) {
|
||||
setTimeout(function() {
|
||||
callingElement.removeClass("buttonactive");
|
||||
getSongList();
|
||||
}, 250);
|
||||
callingElement.removeClass("buttonactive");
|
||||
getSongList();
|
||||
},
|
||||
error: function(jqo, stat, err) {
|
||||
callingElement.removeClass("buttonactive");
|
||||
|
@ -391,6 +391,7 @@ function dropSong (callingElement) {
|
|||
callingElement.addClass("buttonactive");
|
||||
$.ajax({
|
||||
url: 'ajax/ajax_dropsong.php',
|
||||
async: false,
|
||||
success: function (data, stat, jqo) {
|
||||
callingElement.removeClass("buttonactive");
|
||||
getSongList();
|
||||
|
@ -406,6 +407,7 @@ function changeQueue () {
|
|||
$.ajax({
|
||||
url: 'ajax/ajax_changequeue.php',
|
||||
data: {newid: qid},
|
||||
async: false,
|
||||
success: function (data, stat, jqo) {
|
||||
getSongList();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user