Merge pull request #9611 from Snuffleupagus/getMainThreadWorkerMessageHandler-non-PRODUCTION

Clean-up `getMainThreadWorkerMessageHandler` for non-PRODUCTION mode
This commit is contained in:
Tim van der Meij 2018-03-31 15:03:21 +02:00 committed by GitHub
commit 8512596508
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 9 deletions

View File

@ -1317,13 +1317,7 @@ var PDFWorker = (function PDFWorkerClosure() {
if (typeof window === 'undefined') {
return null;
}
if (typeof PDFJSDev === 'undefined' || !PDFJSDev.test('PRODUCTION')) {
return (window.pdfjsNonProductionPdfWorker &&
window.pdfjsNonProductionPdfWorker.WorkerMessageHandler);
}
// PRODUCTION
return (window.pdfjsWorker &&
window.pdfjsWorker.WorkerMessageHandler);
return (window.pdfjsWorker && window.pdfjsWorker.WorkerMessageHandler);
}
let fakeWorkerFilesLoadedCapability;

View File

@ -1524,11 +1524,11 @@ function loadFakeWorker() {
if (typeof PDFJSDev === 'undefined' || !PDFJSDev.test('PRODUCTION')) {
if (typeof SystemJS === 'object') {
SystemJS.import('pdfjs/core/worker').then((worker) => {
window.pdfjsNonProductionPdfWorker = worker;
window.pdfjsWorker = worker;
resolve();
});
} else if (typeof require === 'function') {
window.pdfjsNonProductionPdfWorker = require('../src/core/worker.js');
window.pdfjsWorker = require('../src/core/worker.js');
resolve();
} else {
reject(new Error(