From 7c64e659d0e8a52e24b48aafc9e5f303c28a69e5 Mon Sep 17 00:00:00 2001 From: Fen Dweller Date: Sun, 1 Mar 2020 14:47:45 -0500 Subject: [PATCH] Always show the entity scale slider. Fix clicks leaking out from those into the document --- macrovision.css | 1 - macrovision.js | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/macrovision.css b/macrovision.css index 2fead511..6112bc58 100644 --- a/macrovision.css +++ b/macrovision.css @@ -395,7 +395,6 @@ a { } #slider-entity-scale { - display: none; top: 1%; right: 5%; } diff --git a/macrovision.js b/macrovision.js index cf8e58a8..907f9236 100644 --- a/macrovision.js +++ b/macrovision.js @@ -364,7 +364,6 @@ function deselect() { clearViewList(); clearEntityOptions(); clearViewOptions(); - document.querySelector("#slider-entity-scale").style.display = "none"; } function select(target) { @@ -379,7 +378,6 @@ function select(target) { configViewList(selectedEntity, selectedEntity.view); configEntityOptions(selectedEntity, selectedEntity.view); configViewOptions(selectedEntity, selectedEntity.view); - document.querySelector("#slider-entity-scale").style.display = "block"; } function configViewList(entity, selectedView) { @@ -886,10 +884,12 @@ document.addEventListener("DOMContentLoaded", () => { document.querySelector("#slider-scale").addEventListener("mousedown", e => { dragScaleHandle = setInterval(doSliderScale, 50); + e.stopPropagation(); }); document.querySelector("#slider-scale").addEventListener("touchstart", e => { dragScaleHandle = setInterval(doSliderScale, 50); + e.stopPropagation(); }); document.querySelector("#slider-scale").addEventListener("input", e => { @@ -909,10 +909,12 @@ document.addEventListener("DOMContentLoaded", () => { document.querySelector("#slider-entity-scale").addEventListener("mousedown", e => { dragEntityScaleHandle = setInterval(doSliderEntityScale, 50); + e.stopPropagation(); }); document.querySelector("#slider-entity-scale").addEventListener("touchstart", e => { dragEntityScaleHandle = setInterval(doSliderEntityScale, 50); + e.stopPropagation(); }); document.querySelector("#slider-entity-scale").addEventListener("input", e => {