Updates prior to switching to new Jukebox computer
This commit is contained in:
parent
2b8e992742
commit
b7d0d79ec5
4
index.php
Normal file → Executable file
4
index.php
Normal file → Executable file
|
@ -44,7 +44,7 @@ $queues = Queue::getList();
|
|||
<div id='playing'>
|
||||
<div id='playing_contents' class='playing_contents'></div>
|
||||
<div id='playing_buttons' class='playing_contents'>
|
||||
<p><input type='button' id='skipsong_playing_btn' value='Skip Song'></p>
|
||||
<p><input type='button' class='skipsong_btn' id='skipsong_playing_btn' value='Skip Song'></p>
|
||||
<p><input type='button' id='mute_playing_btn' value='Mute'></p>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -56,7 +56,7 @@ $queues = Queue::getList();
|
|||
<div id='volume_slider'></div>
|
||||
</div>
|
||||
<p><input type='button' id='mute_btn' value='Mute'></p>
|
||||
<p><input type='button' id='skipsong_btn' value='Skip Song'></p>
|
||||
<p><input type='button' class='skipsong_btn' id='skipsong_btn' value='Skip Song'></p>
|
||||
<p><input type='button' id='dropsong_btn' value='Drop Song'></p>
|
||||
<p><input type='button' id='emptyjukebox_btn' value='Empty Jukebox'></p>
|
||||
<p><input type='button' id='christmas_btn' value='Christmas: Inactive' class='christmas_btn'>
|
||||
|
|
20
minimal.js
20
minimal.js
|
@ -21,8 +21,9 @@ $(document).ready(function() {
|
|||
});
|
||||
$('#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)); });
|
||||
//$('#skipsong_playing_btn').click(function() { skipSong($(this)); });
|
||||
$('.skipsong_btn').click(function() { skipSong($(this)); });
|
||||
$('#dropsong_btn').click(function() { dropSong($(this)); });
|
||||
$('#mute_btn').click(function() { toggleMute($(this)); });
|
||||
$('#mute_playing_btn').click(function() { toggleMute($(this)); });
|
||||
|
@ -169,6 +170,9 @@ function toggleChristmas(callingElement) {
|
|||
success: function(data, stat, jqo) {
|
||||
callingElement.removeClass("buttonactive");
|
||||
updateChristmasButton(data.christmas);
|
||||
},
|
||||
error: function(jqo, stat, err) {
|
||||
callingElement.removeClass("buttonactive");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
@ -341,6 +345,9 @@ function toggleMute(callingElement, show) {
|
|||
success: function(data, stat, jqo) {
|
||||
callingElement.removeClass("buttonactive");
|
||||
updateMuteButton(data.muted);
|
||||
},
|
||||
error: function(jqo, stat, err) {
|
||||
callingElement.removeClass("buttonactive");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
@ -355,6 +362,9 @@ function skipSong (callingElement) {
|
|||
success: function (data, stat, jqo) {
|
||||
callingElement.removeClass("buttonactive");
|
||||
getSongList();
|
||||
},
|
||||
error: function(jqo, stat, err) {
|
||||
callingElement.removeClass("buttonactive");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
@ -368,6 +378,9 @@ function emptyJukebox (callingElement) {
|
|||
callingElement.removeClass("buttonactive");
|
||||
getJukeboxList();
|
||||
//skipSong();
|
||||
},
|
||||
error: function(jqo, stat, err) {
|
||||
callingElement.removeClass("buttonactive");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
@ -382,6 +395,9 @@ function dropSong (callingElement) {
|
|||
success: function (data, stat, jqo) {
|
||||
callingElement.removeClass("buttonactive");
|
||||
getSongList();
|
||||
},
|
||||
error: function(jqo, stat, err) {
|
||||
callingElement.removeClass("buttonactive");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user