From 85fd76546271b0d6025e4a35ca125524e700ac59 Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Wed, 25 Jan 2023 10:47:03 +0100 Subject: [PATCH] Tweak the `normalizeWheelEventDelta` helper function This function is only used in PresentationMode these days, but we can still improve it a little bit: - Use the existing web-platform `deltaMode` constants, rather than defining our own constants for those values. - Access the `deltaMode` first, before the `delta{X, Y}` properties, to avoid being affected by bug 1392460 (similar to the default viewer). --- web/ui_utils.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/web/ui_utils.js b/web/ui_utils.js index 45e0d3579..5bff9f2d8 100644 --- a/web/ui_utils.js +++ b/web/ui_utils.js @@ -622,17 +622,16 @@ function normalizeWheelEventDirection(evt) { } function normalizeWheelEventDelta(evt) { + const deltaMode = evt.deltaMode; // Avoid being affected by bug 1392460. let delta = normalizeWheelEventDirection(evt); - const MOUSE_DOM_DELTA_PIXEL_MODE = 0; - const MOUSE_DOM_DELTA_LINE_MODE = 1; const MOUSE_PIXELS_PER_LINE = 30; const MOUSE_LINES_PER_PAGE = 30; // Converts delta to per-page units - if (evt.deltaMode === MOUSE_DOM_DELTA_PIXEL_MODE) { + if (deltaMode === WheelEvent.DOM_DELTA_PIXEL) { delta /= MOUSE_PIXELS_PER_LINE * MOUSE_LINES_PER_PAGE; - } else if (evt.deltaMode === MOUSE_DOM_DELTA_LINE_MODE) { + } else if (deltaMode === WheelEvent.DOM_DELTA_LINE) { delta /= MOUSE_LINES_PER_PAGE; } return delta;