From 0d54984f3850dd73e44f2f4aac1de52753160b75 Mon Sep 17 00:00:00 2001
From: jcass <john.cass77@gmail.com>
Date: Sun, 14 Feb 2016 20:25:14 +0200
Subject: [PATCH] Prevent 'volumeChanged' events from interfering will volume
 slider being dragged.

---
 mopidy_musicbox_webclient/static/js/controls.js      | 6 ++----
 mopidy_musicbox_webclient/static/js/functionsvars.js | 1 +
 mopidy_musicbox_webclient/static/js/gui.js           | 4 ++++
 mopidy_musicbox_webclient/static/mb.manifest         | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/mopidy_musicbox_webclient/static/js/controls.js b/mopidy_musicbox_webclient/static/js/controls.js
index b4efca2..ef4a0d0 100644
--- a/mopidy_musicbox_webclient/static/js/controls.js
+++ b/mopidy_musicbox_webclient/static/js/controls.js
@@ -375,10 +375,8 @@ function setPosition(pos) {
  ***********************************************/
 
 function setVolume(value) {
-    if (!volumeChanging && $("#volumeslider").val() != value) {
-        $( "#volumeslider" ).off( "change" );
-        $("#volumeslider").val(value).slider('refresh');
-        $( "#volumeslider" ).on( "change", function() { doVolume( $(this).val() ); } )
+    if (!volumeChanging && !volumeSliding && $("#volumeslider").val() != value) {
+        $( "#volumeslider" ).val(value).slider('refresh');
     }
 }
 
diff --git a/mopidy_musicbox_webclient/static/js/functionsvars.js b/mopidy_musicbox_webclient/static/js/functionsvars.js
index 472bb32..813eff9 100644
--- a/mopidy_musicbox_webclient/static/js/functionsvars.js
+++ b/mopidy_musicbox_webclient/static/js/functionsvars.js
@@ -15,6 +15,7 @@ var single;
 var currentVolume = -1;
 var mute;
 var volumeChanging;
+var volumeSliding;
 
 var initgui = true;
 var currentpos = 0;
diff --git a/mopidy_musicbox_webclient/static/js/gui.js b/mopidy_musicbox_webclient/static/js/gui.js
index 2894626..6fdf5d8 100644
--- a/mopidy_musicbox_webclient/static/js/gui.js
+++ b/mopidy_musicbox_webclient/static/js/gui.js
@@ -574,6 +574,10 @@ $(document).ready(function(event) {
 
     $( "#trackslider" ).on( "slidestart", function() { progressTimer.stop(); } )
     $( "#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) {
diff --git a/mopidy_musicbox_webclient/static/mb.manifest b/mopidy_musicbox_webclient/static/mb.manifest
index f90424b..c373c24 100644
--- a/mopidy_musicbox_webclient/static/mb.manifest
+++ b/mopidy_musicbox_webclient/static/mb.manifest
@@ -1,6 +1,6 @@
 CACHE MANIFEST
 
-# 2016-02-14:v4
+# 2016-02-14:v5
 
 NETWORK:
 *