diff --git a/README.rst b/README.rst index 931ff21..4eb655d 100644 --- a/README.rst +++ b/README.rst @@ -76,6 +76,7 @@ v2.2.0 (UNRELEASED) - Prevent mobile devices from scaling when used in landscape mode. (Fixes: `#157 `_). - Scrolling now works in full screen mode for Chrome and Safari as well. (Fixes: `#53 `_). - No longer interferes with changes to Mopidy's volume levels that are triggered externally. (Fixes: `#162 `_). +- Volume slider now works with Mopidy-ALSAMixer again. (Fixes: `#168 `_). v2.1.1 (2016-02-04) ------------------- diff --git a/mopidy_musicbox_webclient/static/js/controls.js b/mopidy_musicbox_webclient/static/js/controls.js index ef4a0d0..ebcf675 100644 --- a/mopidy_musicbox_webclient/static/js/controls.js +++ b/mopidy_musicbox_webclient/static/js/controls.js @@ -376,14 +376,18 @@ function setPosition(pos) { function setVolume(value) { if (!volumeChanging && !volumeSliding && $("#volumeslider").val() != value) { + $( "#volumeslider" ).off( "change"); $( "#volumeslider" ).val(value).slider('refresh'); + $( "#volumeslider" ).on( "change", function() { doVolume( $(this).val() ); } ); } } function doVolume(value) { if (!volumeChanging) { volumeChanging = value; - mopidy.playback.setVolume({'volume': parseInt(value)}); + mopidy.playback.setVolume({'volume': parseInt(volumeChanging)}).then( function() { + volumeChanging = null; + }); } } diff --git a/mopidy_musicbox_webclient/static/js/gui.js b/mopidy_musicbox_webclient/static/js/gui.js index 6fdf5d8..d63323e 100644 --- a/mopidy_musicbox_webclient/static/js/gui.js +++ b/mopidy_musicbox_webclient/static/js/gui.js @@ -257,9 +257,6 @@ function initSocketevents() { }); mopidy.on("event:volumeChanged", function(data) { - if (volumeChanging && volumeChanging == data["volume"]) { - volumeChanging = null; - } setVolume(data["volume"]); }); @@ -572,12 +569,12 @@ $(document).ready(function(event) { event.stopImmediatePropagation(); } } ); - $( "#trackslider" ).on( "slidestart", function() { progressTimer.stop(); } ) + $( "#trackslider" ).on( "slidestart", function() { progressTimer.stop(); } ); $( "#trackslider" ).on( "slidestop", function() { doSeekPos( $(this).val() ); } ); - $( "#volumeslider" ).on( "slidestart", function() { volumeSliding = true; } ) + $( "#volumeslider" ).on( "slidestart", function() { volumeSliding = true; } ); $( "#volumeslider" ).on( "slidestop", function() { volumeSliding = false; } ); - $( "#volumeslider" ).on( "change", function() { doVolume( $(this).val() ); } ) + $( "#volumeslider" ).on( "change", function() { doVolume( $(this).val() ); } ); }); function updatePlayIcons (uri, tlid) { diff --git a/mopidy_musicbox_webclient/static/mb.manifest b/mopidy_musicbox_webclient/static/mb.manifest index c373c24..8ff8679 100644 --- a/mopidy_musicbox_webclient/static/mb.manifest +++ b/mopidy_musicbox_webclient/static/mb.manifest @@ -1,6 +1,6 @@ CACHE MANIFEST -# 2016-02-14:v5 +# 2016-02-15:v1 NETWORK: *