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

Merge pull request #12992 from Snuffleupagus/scripting-compact-fallback-events

Browse Source 
Use a more compact format for the fallback EventBus-listeners in `PDFViewerApplication_initializeJavaScript`
This commit is contained in:
Tim van der Meij 2021-02-14 15:13:48 +01:00 committed by GitHub
commit b9beca90c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
web/app.js
View File

@ -1479,13 +1479,7 @@ const PDFViewerApplication = {
// It should be *extremely* rare for metadata to not have been resolved
// when this code runs, but ensure that we handle that case here.
await new Promise(resolve => {
this.eventBus._on(
"metadataloaded",
evt => {
resolve();
},
{ once: true }
);
this.eventBus._on("metadataloaded", resolve, { once: true });
});
if (pdfDocument !== this.pdfDocument) {
return; // The document was closed while the metadata resolved.
@ -1498,13 +1492,7 @@ const PDFViewerApplication = {
// Hence we'll simply have to trust that the `contentLength` (as provided
// by the server), when it exists, is accurate enough here.
await new Promise(resolve => {
this.eventBus._on(
"documentloaded",
evt => {
resolve();
},
{ once: true }
);
this.eventBus._on("documentloaded", resolve, { once: true });
});
if (pdfDocument !== this.pdfDocument) {
return; // The document was closed while the downloadInfo resolved.

6
web/base_viewer.js
View File

@ -740,8 +740,8 @@ class BaseViewer {
*/
get _pageWidthScaleFactor() {
if (
this.spreadMode !== SpreadMode.NONE &&
this.scrollMode !== ScrollMode.HORIZONTAL &&
this._spreadMode !== SpreadMode.NONE &&
this._scrollMode !== ScrollMode.HORIZONTAL &&
!this.isInPresentationMode
) {
return 2;
@ -1642,7 +1642,7 @@ class BaseViewer {
return true;
}
initializeScriptingEvents() {
async initializeScriptingEvents() {
if (!this.enableScripting || this._pageOpenPendingSet) {
return;
}