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

Remove some unused `require` statements, used when loading fake workers, in non-`PRODUCTION` mode
mozilla · Oct 31, 2019 · c807637 · c807637
2 parents 72bd8e8 + eedd449
commit c807637
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 26 deletions.
diff --git a/src/display/api.js b/src/display/api.js
@@ -1569,16 +1569,9 @@ const PDFWorker = (function PDFWorkerClosure() {
         SystemJS.import('pdfjs/core/worker').then((worker) => {
           fakeWorkerFilesLoadedCapability.resolve(worker.WorkerMessageHandler);
         }).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 {
-        fakeWorkerFilesLoadedCapability.reject(new Error(
-          'SystemJS or CommonJS must be used to load fake worker.'));
+        fakeWorkerFilesLoadedCapability.reject(
+          new Error('SystemJS must be used to load fake worker.'));
       }
     } else {
       const loader = fakeWorkerFilesLoader || function() {

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

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