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

Merge pull request #11294 from Snuffleupagus/rm-non-PRODUCTION-require

Browse Source 
Remove some unused `require` statements, used when loading fake workers, in non-`PRODUCTION` mode
This commit is contained in:
Tim van der Meij 2019-10-31 23:47:55 +01:00 committed by GitHub
commit c807637f40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/display/api.js
View File

@ -1569,16 +1569,9 @@ const PDFWorker = (function PDFWorkerClosure() {
SystemJS.import('pdfjs/core/worker').then((worker) => { SystemJS.import('pdfjs/core/worker').then((worker) => {
fakeWorkerFilesLoadedCapability.resolve(worker.WorkerMessageHandler); fakeWorkerFilesLoadedCapability.resolve(worker.WorkerMessageHandler);
}).catch(fakeWorkerFilesLoadedCapability.reject); }).catch(fakeWorkerFilesLoadedCapability.reject);
} else if (typeof require === 'function') {
try {
const worker = require('../core/worker.js');
fakeWorkerFilesLoadedCapability.resolve(worker.WorkerMessageHandler);
} catch (ex) {
fakeWorkerFilesLoadedCapability.reject(ex);
}
} else { } else {
fakeWorkerFilesLoadedCapability.reject(new Error( fakeWorkerFilesLoadedCapability.reject(
'SystemJS or CommonJS must be used to load fake worker.')); new Error('SystemJS must be used to load fake worker.'));
} }
} else { } else {
const loader = fakeWorkerFilesLoader || function() { const loader = fakeWorkerFilesLoader || function() {

10
web/app.js
View File

@ -1532,16 +1532,8 @@ function loadFakeWorker() {
window.pdfjsWorker = worker; window.pdfjsWorker = worker;
resolve(); resolve();
}).catch(reject); }).catch(reject);
} else if (typeof require === 'function') {
try {
window.pdfjsWorker = require('../src/core/worker.js');
resolve();
} catch (ex) {
reject(ex);
}
} else { } else {
reject(new Error( reject(new Error('SystemJS must be used to load fake worker.'));
'SystemJS or CommonJS must be used to load fake worker.'));
} }
}); });
} }

9
web/preferences.js
View File

@ -23,15 +23,8 @@ function getDefaultPreferences() {
defaultPreferences = new Promise(function(resolve, reject) { defaultPreferences = new Promise(function(resolve, reject) {
if (typeof SystemJS === 'object') { if (typeof SystemJS === 'object') {
SystemJS.import('./app_options').then(resolve, reject); SystemJS.import('./app_options').then(resolve, reject);
} else if (typeof require === 'function') {
try {
resolve(require('./app_options.js'));
} catch (ex) {
reject(ex);
}
} else { } else {
reject(new Error( reject(new Error('SystemJS must be used to load AppOptions.'));
'SystemJS or CommonJS must be used to load AppOptions.'));
} }
}).then(function({ AppOptions, OptionKind, }) { }).then(function({ AppOptions, OptionKind, }) {
return AppOptions.getAll(OptionKind.PREFERENCE); return AppOptions.getAll(OptionKind.PREFERENCE);