Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11003 from Snuffleupagus/webViewerWheel-supportedKeys

Browse Source 
Ensure that setting the `zoomDisabledTimeout` isn't skipped, regardless of the supported zoom keys, when handling mouse wheel events (PR 7097 follow-up)
This commit is contained in:
Tim van der Meij 2019-07-23 22:28:36 +02:00 committed by GitHub
commit 9b72089886
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/app.js
View File

@ -2097,17 +2097,15 @@ function setZoomDisabledTimeout() {
} }
function webViewerWheel(evt) { function webViewerWheel(evt) {
let pdfViewer = PDFViewerApplication.pdfViewer; const { pdfViewer, supportedMouseWheelZoomModifierKeys, } =
PDFViewerApplication;
if (pdfViewer.isInPresentationMode) { if (pdfViewer.isInPresentationMode) {
return; return;
} }
if (evt.ctrlKey || evt.metaKey) { if ((evt.ctrlKey && supportedMouseWheelZoomModifierKeys.ctrlKey) ||
let support = PDFViewerApplication.supportedMouseWheelZoomModifierKeys; (evt.metaKey && supportedMouseWheelZoomModifierKeys.metaKey)) {
if ((evt.ctrlKey && !support.ctrlKey) ||
(evt.metaKey && !support.metaKey)) {
return;
}
// Only zoom the pages, not the entire viewer. // Only zoom the pages, not the entire viewer.
evt.preventDefault(); evt.preventDefault();
// NOTE: this check must be placed *after* preventDefault. // NOTE: this check must be placed *after* preventDefault.