From fe2ae965b32e810bb93ac55fcbd5e5a6af776541 Mon Sep 17 00:00:00 2001
From: Joakim Plate <elupus@ecce.se>
Date: Thu, 9 May 2019 04:53:34 +0200
Subject: [PATCH] Make sure we block emulated mouse events when touch is used
 (#3173)

---
 src/dialogs/more-info/controls/more-info-media_player.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/dialogs/more-info/controls/more-info-media_player.js b/src/dialogs/more-info/controls/more-info-media_player.js
index 6f3541d3fe..54d741fd22 100644
--- a/src/dialogs/more-info/controls/more-info-media_player.js
+++ b/src/dialogs/more-info/controls/more-info-media_player.js
@@ -111,6 +111,7 @@ class MoreInfoMediaPlayer extends LocalizeMixin(EventsMixin(PolymerElement)) {
             disabled$="[[playerObj.isMuted]]"
             on-mousedown="handleVolumeDown"
             on-touchstart="handleVolumeDown"
+            on-touchend="handleVolumeTouchEnd"
             icon="hass:volume-medium"
           ></paper-icon-button>
           <paper-icon-button
@@ -118,6 +119,7 @@ class MoreInfoMediaPlayer extends LocalizeMixin(EventsMixin(PolymerElement)) {
             disabled$="[[playerObj.isMuted]]"
             on-mousedown="handleVolumeUp"
             on-touchstart="handleVolumeUp"
+            on-touchend="handleVolumeTouchEnd"
             icon="hass:volume-high"
           ></paper-icon-button>
         </div>
@@ -357,6 +359,12 @@ class MoreInfoMediaPlayer extends LocalizeMixin(EventsMixin(PolymerElement)) {
     this.playerObj.volumeMute(!this.playerObj.isMuted);
   }
 
+  handleVolumeTouchEnd(ev) {
+    /* when touch ends, we must prevent this from
+     * becoming a mousedown, up, click by emulation */
+    ev.preventDefault();
+  }
+
   handleVolumeUp() {
     const obj = this.$.volumeUp;
     this.handleVolumeWorker("volume_up", obj, true);