From 71d61e4c6fc74d94c2cdd6d6b522697c92777504 Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Sun, 8 Dec 2019 14:03:32 +0100 Subject: [PATCH] Re-factor `getMainThreadWorkerMessageHandler` to support arbitrary global scopes, rather than only `window` --- src/display/api.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/display/api.js b/src/display/api.js index c1aa7c8cc..b83292872 100644 --- a/src/display/api.js +++ b/src/display/api.js @@ -1540,12 +1540,12 @@ const PDFWorker = (function PDFWorkerClosure() { } function getMainThreadWorkerMessageHandler() { + let mainWorkerMessageHandler; try { - if (typeof window !== 'undefined') { - return (window.pdfjsWorker && window.pdfjsWorker.WorkerMessageHandler); - } - } catch (ex) { } - return null; + mainWorkerMessageHandler = + globalThis.pdfjsWorker && globalThis.pdfjsWorker.WorkerMessageHandler; + } catch (ex) { /* Ignore errors. */ } + return mainWorkerMessageHandler || null; } // Loads worker code into main thread.