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

Merge pull request #10351 from Snuffleupagus/tab-switch-no-wheel-zoom

Browse Source 
Attempt to ignore mouse wheel zooming during tab switches (bug 1503412)
This commit is contained in:
Tim van der Meij 2018-12-12 22:50:11 +01:00 committed by GitHub
commit c13a426eed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
web/app.js
View File

@ -50,6 +50,7 @@ import { ViewHistory } from './view_history';
const DEFAULT_SCALE_DELTA = 1.1; const DEFAULT_SCALE_DELTA = 1.1;
const DISABLE_AUTO_FETCH_LOADING_BAR_TIMEOUT = 5000; // ms const DISABLE_AUTO_FETCH_LOADING_BAR_TIMEOUT = 5000; // ms
const FORCE_PAGES_LOADED_TIMEOUT = 10000; // ms const FORCE_PAGES_LOADED_TIMEOUT = 10000; // ms
const WHEEL_ZOOM_DISABLED_TIMEOUT = 1000; // ms
const DefaultExternalServices = { const DefaultExternalServices = {
updateFindControlState(data) {}, updateFindControlState(data) {},
@ -1334,6 +1335,7 @@ let PDFViewerApplication = {
eventBus.dispatch('afterprint', { source: window, }); eventBus.dispatch('afterprint', { source: window, });
}; };
window.addEventListener('visibilitychange', webViewerVisibilityChange);
window.addEventListener('wheel', webViewerWheel); window.addEventListener('wheel', webViewerWheel);
window.addEventListener('click', webViewerClick); window.addEventListener('click', webViewerClick);
window.addEventListener('keydown', webViewerKeyDown); window.addEventListener('keydown', webViewerKeyDown);
@ -1394,6 +1396,7 @@ let PDFViewerApplication = {
unbindWindowEvents() { unbindWindowEvents() {
let { _boundEvents, } = this; let { _boundEvents, } = this;
window.removeEventListener('visibilitychange', webViewerVisibilityChange);
window.removeEventListener('wheel', webViewerWheel); window.removeEventListener('wheel', webViewerWheel);
window.removeEventListener('click', webViewerClick); window.removeEventListener('click', webViewerClick);
window.removeEventListener('keydown', webViewerKeyDown); window.removeEventListener('keydown', webViewerKeyDown);
@ -2006,7 +2009,23 @@ function webViewerPageChanging(evt) {
} }
} }
let zoomDisabled = false, zoomDisabledTimeout; function webViewerVisibilityChange(evt) {
if (document.visibilityState === 'visible') {
// Ignore mouse wheel zooming during tab switches (bug 1503412).
setZoomDisabledTimeout();
}
}
let zoomDisabledTimeout = null;
function setZoomDisabledTimeout() {
if (zoomDisabledTimeout) {
clearTimeout(zoomDisabledTimeout);
}
zoomDisabledTimeout = setTimeout(function() {
zoomDisabledTimeout = null;
}, WHEEL_ZOOM_DISABLED_TIMEOUT);
}
function webViewerWheel(evt) { function webViewerWheel(evt) {
let pdfViewer = PDFViewerApplication.pdfViewer; let pdfViewer = PDFViewerApplication.pdfViewer;
if (pdfViewer.isInPresentationMode) { if (pdfViewer.isInPresentationMode) {
@ -2022,7 +2041,7 @@ function webViewerWheel(evt) {
// 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.
if (zoomDisabled) { if (zoomDisabledTimeout || document.visibilityState === 'hidden') {
return; return;
} }
@ -2051,11 +2070,7 @@ function webViewerWheel(evt) {
pdfViewer.container.scrollTop += dy * scaleCorrectionFactor; pdfViewer.container.scrollTop += dy * scaleCorrectionFactor;
} }
} else { } else {
zoomDisabled = true; setZoomDisabledTimeout();
clearTimeout(zoomDisabledTimeout);
zoomDisabledTimeout = setTimeout(function () {
zoomDisabled = false;
}, 1000);
} }
} }