Merge pull request #1509 from rern/UPDATE

u
rern · Nov 25, 2023 · cdd1528 · cdd1528
2 parents fee72b9 + 16c5fd8
commit cdd1528
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/srv/http/assets/js/main.js b/srv/http/assets/js/main.js
@@ -629,7 +629,8 @@ $( '#volume' ).roundSlider( {
 		if ( V.press ) {
 			var diff  = 3;
 		} else {
-			var diff  = Math.abs( e.value - S.volume || S.volume - S.volumemute ); // change || mute/unmute
+			if ( ! V.volumeprev ) V.volumeprev = S.volume; // V.volumeprev from psVolume()
+			var diff  = Math.abs( e.value - V.volumeprev || S.volume - S.volumemute ); // change || mute/unmute
 		}
 		var speed = diff * 40; // 1% : 40ms
 		$volumehandlerotate.css( 'transition-duration', speed +'ms' );
@@ -655,7 +656,8 @@ $( '#volume' ).roundSlider( {
 	, valueChange       : function( e ) {
 		if ( V.drag || ! V.create ) return // ! V.create - suppress fire before 'create'
 
-		S.volume = e.value;
+		S.volume     = e.value;
+		V.volumeprev = false;
 		$volumehandle.rsRotate( e.value ? -this._handle1.angle : -310 );
 	}
 	, stop              : () => {

diff --git a/srv/http/assets/js/passive.js b/srv/http/assets/js/passive.js
@@ -389,6 +389,7 @@ function psSavedPlaylists( data ) {
 	$( '#mode-playlists gr' ).text( count || '' );
 }
 function psVolume( data ) {
+	V.volumeprev = S.volume;
 	if ( [ 'mute', 'unmute' ].includes( data.type ) ) {
 		V.local = false; // allow beforeValueChange()
 		$( '#volume-knob, #button-volume i' ).addClass( 'disabled' );