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

Allows requirejs and node load fake worker files.

Browse Source
This commit is contained in:
Yury Delendik 2015-11-23 11:46:40 -06:00
parent 450edc95cc
commit b084dc09ee
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/worker.js
View File

@ -648,7 +648,7 @@ var workerConsole = {
// Worker thread? // Worker thread?
if (typeof window === 'undefined') { if (typeof window === 'undefined' && typeof require === 'undefined') {
if (!('console' in globalScope)) { if (!('console' in globalScope)) {
globalScope.console = workerConsole; globalScope.console = workerConsole;
} }

15
src/display/api.js
View File

@ -19,7 +19,7 @@
if (typeof define === 'function' && define.amd) { if (typeof define === 'function' && define.amd) {
define('pdfjs/display/api', ['exports', 'pdfjs/shared/util', define('pdfjs/display/api', ['exports', 'pdfjs/shared/util',
'pdfjs/display/font_loader', 'pdfjs/display/canvas', 'pdfjs/display/font_loader', 'pdfjs/display/canvas',
'pdfjs/shared/global'], factory); 'pdfjs/shared/global', 'require'], factory);
} else if (typeof exports !== 'undefined') { } else if (typeof exports !== 'undefined') {
factory(exports, require('../shared/util.js'), require('./font_loader.js'), factory(exports, require('../shared/util.js'), require('./font_loader.js'),
require('./canvas.js'), require('../shared/global.js')); require('./canvas.js'), require('../shared/global.js'));
@ -29,7 +29,7 @@
root.pdfjsSharedGlobal); root.pdfjsSharedGlobal);
} }
}(this, function (exports, sharedUtil, displayFontLoader, displayCanvas, }(this, function (exports, sharedUtil, displayFontLoader, displayCanvas,
sharedGlobal) { sharedGlobal, amdRequire) {
var InvalidPDFException = sharedUtil.InvalidPDFException; var InvalidPDFException = sharedUtil.InvalidPDFException;
var MessageHandler = sharedUtil.MessageHandler; var MessageHandler = sharedUtil.MessageHandler;
@ -1169,7 +1169,16 @@ var PDFWorker = (function PDFWorkerClosure() {
// other files and resolves the promise. In production only the // other files and resolves the promise. In production only the
// pdf.worker.js file is needed. // pdf.worker.js file is needed.
//#if !PRODUCTION //#if !PRODUCTION
Util.loadScript(PDFJS.workerSrc); if (typeof amdRequire === 'function') {
amdRequire(['pdfjs/core/worker'], function () {
PDFJS.fakeWorkerFilesLoadedCapability.resolve();
});
} else if (typeof require === 'function') {
require('../core/worker.js');
PDFJS.fakeWorkerFilesLoadedCapability.resolve();
} else {
Util.loadScript(PDFJS.workerSrc);
}
//#endif //#endif
//#if PRODUCTION && SINGLE_FILE //#if PRODUCTION && SINGLE_FILE
// PDFJS.fakeWorkerFilesLoadedCapability.resolve(); // PDFJS.fakeWorkerFilesLoadedCapability.resolve();