andpp/mopidy-musicbox-webclient
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prevent 'volumeChanged' events from interfering will volume slider being dragged.

Browse Source
This commit is contained in:
jcass 2016-02-14 20:25:14 +02:00
parent 1ad34ee23d
commit 0d54984f38
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mopidy_musicbox_webclient/static/js/controls.js vendored
View File

@ -375,10 +375,8 @@ function setPosition(pos) {
***********************************************/ ***********************************************/
function setVolume(value) { function setVolume(value) {
if (!volumeChanging && $("#volumeslider").val() != value) { if (!volumeChanging && !volumeSliding && $("#volumeslider").val() != value) {
$( "#volumeslider" ).off( "change" ); $( "#volumeslider" ).val(value).slider('refresh');
$("#volumeslider").val(value).slider('refresh');
$( "#volumeslider" ).on( "change", function() { doVolume( $(this).val() ); } )
} }
} }

1
mopidy_musicbox_webclient/static/js/functionsvars.js
View File

@ -15,6 +15,7 @@ var single;
var currentVolume = -1; var currentVolume = -1;
var mute; var mute;
var volumeChanging; var volumeChanging;
var volumeSliding;
var initgui = true; var initgui = true;
var currentpos = 0; var currentpos = 0;

4
mopidy_musicbox_webclient/static/js/gui.js
View File

@ -574,6 +574,10 @@ $(document).ready(function(event) {
$( "#trackslider" ).on( "slidestart", function() { progressTimer.stop(); } ) $( "#trackslider" ).on( "slidestart", function() { progressTimer.stop(); } )
$( "#trackslider" ).on( "slidestop", function() { doSeekPos( $(this).val() ); } ); $( "#trackslider" ).on( "slidestop", function() { doSeekPos( $(this).val() ); } );
$( "#volumeslider" ).on( "slidestart", function() { volumeSliding = true; } )
$( "#volumeslider" ).on( "slidestop", function() { volumeSliding = false; } );
$( "#volumeslider" ).on( "change", function() { doVolume( $(this).val() ); } )
}); });
function updatePlayIcons (uri, tlid) { function updatePlayIcons (uri, tlid) {

2
mopidy_musicbox_webclient/static/mb.manifest
View File

@ -1,6 +1,6 @@
CACHE MANIFEST CACHE MANIFEST
# 2016-02-14:v4 # 2016-02-14:v5
NETWORK: NETWORK:
* *