Merge pull request #7185 from iloire/issue-7177-support-almondjs

Support almond.js #7177
mozilla · Apr 12, 2016 · b834b68 · b834b68
2 parents 127e6d7 + 1dfc491
commit b834b68
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/frameworks.js b/src/frameworks.js
@@ -36,12 +36,13 @@ if (typeof __webpack_require__ !== 'undefined') {
 if (typeof requirejs !== 'undefined' && requirejs.toUrl) {
   workerSrc = requirejs.toUrl('pdfjs-dist/build/pdf.worker.js');
 }
+var dynamicLoaderSupported = typeof requirejs !== 'undefined' && requirejs.load;
 var fakeWorkerFilesLoader = useRequireEnsure ? (function (callback) {
   require.ensure([], function () {
     var worker = require('./pdf.worker.js');
     callback(worker.WorkerMessageHandler);
   });
-}) : (typeof requirejs !== 'undefined') ? (function (callback) {
+}) : dynamicLoaderSupported ? (function (callback) {
   requirejs(['pdfjs-dist/build/pdf.worker'], function (worker) {
     callback(worker.WorkerMessageHandler);
   });