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

Move destroying of the scripting-instance from PDFViewerApplication.close and into its own helper method

Browse Source 
Since the `close` method has become quite large, this small re-factoring shouldn't hurt (and may also be useful with future changes to the `_initializeJavaScript` method).
This commit is contained in:
Jonas Jenwald 2020-12-07 17:54:44 +01:00
parent 8d72981c18
commit 6c807f3f86
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
web/app.js
View File

@ -776,6 +776,26 @@ const PDFViewerApplication = {
this._idleCallbacks.clear(); this._idleCallbacks.clear();
}, },
/**
* @private
*/
async _destroyScriptingInstance() {
if (!this._scriptingInstance) {
return;
}
const { scripting, events } = this._scriptingInstance;
try {
await scripting.destroySandbox();
} catch (ex) {}
for (const [name, listener] of events) {
window.removeEventListener(name, listener);
}
events.clear();
this._scriptingInstance = null;
},
/** /**
* Closes opened PDF document. * Closes opened PDF document.
* @returns {Promise} - Returns the promise, which is resolved when all * @returns {Promise} - Returns the promise, which is resolved when all
@ -788,8 +808,9 @@ const PDFViewerApplication = {
if (!this.pdfLoadingTask) { if (!this.pdfLoadingTask) {
return undefined; return undefined;
} }
const promises = [];
const promise = this.pdfLoadingTask.destroy(); promises.push(this.pdfLoadingTask.destroy());
this.pdfLoadingTask = null; this.pdfLoadingTask = null;
if (this.pdfDocument) { if (this.pdfDocument) {
@ -814,18 +835,7 @@ const PDFViewerApplication = {
this._saveInProgress = false; this._saveInProgress = false;
this._cancelIdleCallbacks(); this._cancelIdleCallbacks();
promises.push(this._destroyScriptingInstance());
if (this._scriptingInstance) {
const { scripting, events } = this._scriptingInstance;
try {
scripting.destroySandbox();
} catch (ex) {}
for (const [name, listener] of events) {
window.removeEventListener(name, listener);
}
this._scriptingInstance = null;
}
this.pdfSidebar.reset(); this.pdfSidebar.reset();
this.pdfOutlineViewer.reset(); this.pdfOutlineViewer.reset();
@ -844,7 +854,7 @@ const PDFViewerApplication = {
if (typeof PDFBug !== "undefined") { if (typeof PDFBug !== "undefined") {
PDFBug.cleanup(); PDFBug.cleanup();
} }
return promise; return Promise.all(promises);
}, },
/** /**