Ensure that setting the zoomDisabledTimeout
isn't skipped, regardless of the supported zoom keys, when handling mouse wheel events (PR 7097 follow-up)
*Possible follow-up:* It probably wouldn't hurt to try and shorten the `supportedMouseWheelZoomModifierKeys` name a bit, but I'm not attempting that here since it'd also require updating `PdfStreamConverter.jsm` in mozilla-central in order to be consistent.
This commit is contained in:
parent
1f287ec486
commit
1eed5b7235
12
web/app.js
12
web/app.js
@ -2093,17 +2093,15 @@ function setZoomDisabledTimeout() {
|
||||
}
|
||||
|
||||
function webViewerWheel(evt) {
|
||||
let pdfViewer = PDFViewerApplication.pdfViewer;
|
||||
const { pdfViewer, supportedMouseWheelZoomModifierKeys, } =
|
||||
PDFViewerApplication;
|
||||
|
||||
if (pdfViewer.isInPresentationMode) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (evt.ctrlKey || evt.metaKey) {
|
||||
let support = PDFViewerApplication.supportedMouseWheelZoomModifierKeys;
|
||||
if ((evt.ctrlKey && !support.ctrlKey) ||
|
||||
(evt.metaKey && !support.metaKey)) {
|
||||
return;
|
||||
}
|
||||
if ((evt.ctrlKey && supportedMouseWheelZoomModifierKeys.ctrlKey) ||
|
||||
(evt.metaKey && supportedMouseWheelZoomModifierKeys.metaKey)) {
|
||||
// Only zoom the pages, not the entire viewer.
|
||||
evt.preventDefault();
|
||||
// NOTE: this check must be placed *after* preventDefault.
|
||||
|
Loading…
x
Reference in New Issue
Block a user