Compare commits
3 Commits
7ed669b4ba
...
2f7735f669
Author | SHA1 | Date | |
---|---|---|---|
2f7735f669 | |||
7ddbc11d27 | |||
83925c2705 |
|
@ -15,12 +15,6 @@ $(document).ready(function() {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
getVolumeRange();
|
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_btn').click(function() { skipSong($(this)); });
|
||||||
//$('#skipsong_playing_btn').click(function() { skipSong($(this)); });
|
//$('#skipsong_playing_btn').click(function() { skipSong($(this)); });
|
||||||
$('.skipsong_btn').click(function() { skipSong($(this)); });
|
$('.skipsong_btn').click(function() { skipSong($(this)); });
|
||||||
|
@ -60,7 +54,6 @@ $(document).ready(function() {
|
||||||
allowPageScroll: "vertical"
|
allowPageScroll: "vertical"
|
||||||
});
|
});
|
||||||
updateQueueSelects();
|
updateQueueSelects();
|
||||||
getVolume();
|
|
||||||
toggleMute($(this), 'show');
|
toggleMute($(this), 'show');
|
||||||
getSongList();
|
getSongList();
|
||||||
getQueueTarget();
|
getQueueTarget();
|
||||||
|
@ -313,11 +306,16 @@ function dropJukeboxSong(id) {
|
||||||
function getVolumeRange() {
|
function getVolumeRange() {
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: 'ajax/ajax_getvolrange.php',
|
url: 'ajax/ajax_getvolrange.php',
|
||||||
async: false,
|
|
||||||
dataType: 'json',
|
dataType: 'json',
|
||||||
success: function(data, stat, jqo) {
|
success: function(data, stat, jqo) {
|
||||||
maxVolume = data.max;
|
maxVolume = data.max;
|
||||||
minVolume = data.min;
|
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();
|
callingElement.blur();
|
||||||
if ( gettingJukeboxList || gettingSongList ) return false;
|
if ( gettingJukeboxList || gettingSongList ) return false;
|
||||||
callingElement.addClass("buttonactive");
|
callingElement.addClass("buttonactive");
|
||||||
|
console.log("Skipping song");
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: 'ajax/ajax_skipsong.php',
|
url: 'ajax/ajax_skipsong.php',
|
||||||
async: false,
|
|
||||||
success: function (data, stat, jqo) {
|
success: function (data, stat, jqo) {
|
||||||
|
setTimeout(function() {
|
||||||
callingElement.removeClass("buttonactive");
|
callingElement.removeClass("buttonactive");
|
||||||
getSongList();
|
getSongList();
|
||||||
|
}, 250);
|
||||||
},
|
},
|
||||||
error: function(jqo, stat, err) {
|
error: function(jqo, stat, err) {
|
||||||
callingElement.removeClass("buttonactive");
|
callingElement.removeClass("buttonactive");
|
||||||
|
@ -391,7 +391,6 @@ function dropSong (callingElement) {
|
||||||
callingElement.addClass("buttonactive");
|
callingElement.addClass("buttonactive");
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: 'ajax/ajax_dropsong.php',
|
url: 'ajax/ajax_dropsong.php',
|
||||||
async: false,
|
|
||||||
success: function (data, stat, jqo) {
|
success: function (data, stat, jqo) {
|
||||||
callingElement.removeClass("buttonactive");
|
callingElement.removeClass("buttonactive");
|
||||||
getSongList();
|
getSongList();
|
||||||
|
@ -407,7 +406,6 @@ function changeQueue () {
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: 'ajax/ajax_changequeue.php',
|
url: 'ajax/ajax_changequeue.php',
|
||||||
data: {newid: qid},
|
data: {newid: qid},
|
||||||
async: false,
|
|
||||||
success: function (data, stat, jqo) {
|
success: function (data, stat, jqo) {
|
||||||
getSongList();
|
getSongList();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user