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

Access the setTimeout-functionRefs correctly in SandboxSupportBase.destroy

Browse Source 
*This effectively replaces PR 15465.*

As outlined in https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map/forEach, the argument order when iterating through a `Map` is actually `value, key`.
Ignoring the incorrect Array used in the old code, I cannot imagine that this would've worked anyway since we didn't use the actual `setTimeout`-functionRefs to clear the timeouts; please refer to the `setTimeout`/`setInterval` methods in the `SandboxSupportBase.createSandboxExternals` method.
This commit is contained in:
Jonas Jenwald 2022-09-20 14:01:03 +02:00
parent 8dd2b48488
commit fde1e4996d
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/pdf.sandbox.external.js
View File

@ -30,7 +30,9 @@ class SandboxSupportBase {
destroy() { destroy() {
this.commFun = null; this.commFun = null;
this.timeoutIds.forEach(([_, id]) => this.win.clearTimeout(id)); for (const id of this.timeoutIds.values()) {
this.win.clearTimeout(id);
}
this.timeoutIds = null; this.timeoutIds = null;
} }
@ -88,9 +90,9 @@ class SandboxSupportBase {
}, nMilliseconds); }, nMilliseconds);
this.timeoutIds.set(callbackId, id); this.timeoutIds.set(callbackId, id);
}, },
clearTimeout: id => { clearTimeout: callbackId => {
this.win.clearTimeout(this.timeoutIds.get(id)); this.win.clearTimeout(this.timeoutIds.get(callbackId));
this.timeoutIds.delete(id); this.timeoutIds.delete(callbackId);
}, },
setInterval: (callbackId, nMilliseconds) => { setInterval: (callbackId, nMilliseconds) => {
if ( if (
@ -107,9 +109,9 @@ class SandboxSupportBase {
}, nMilliseconds); }, nMilliseconds);
this.timeoutIds.set(callbackId, id); this.timeoutIds.set(callbackId, id);
}, },
clearInterval: id => { clearInterval: callbackId => {
this.win.clearInterval(this.timeoutIds.get(id)); this.win.clearInterval(this.timeoutIds.get(callbackId));
this.timeoutIds.delete(id); this.timeoutIds.delete(callbackId);
}, },
alert: cMsg => { alert: cMsg => {
if (typeof cMsg !== "string") { if (typeof cMsg !== "string") {