From 1dfc49152a4c8b3aa802828583af4352d00f0e78 Mon Sep 17 00:00:00 2001 From: Ivan Loire Date: Tue, 12 Apr 2016 09:27:45 +1000 Subject: [PATCH] Support almond.js #7177 --- src/frameworks.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/frameworks.js b/src/frameworks.js index 9b5109c97..3ba8a53df 100644 --- 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); });