ZenBrowserMirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/zen-browser/pdf.js.git synced 2025-07-10 18:25:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'refs/heads/master' into text-select

Browse source 
Conflicts:
	src/fonts.js
This commit is contained in:
Artur Adib 2011-11-14 15:21:18 -05:00
commit 5c261b46cc
10 changed files with 781 additions and 547 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/core.js
View file

@ -15,10 +15,6 @@ if (!globalScope.PDFJS) {
globalScope.PDFJS = {};
}
// Temporarily disabling workers until 'localhost' FF bugfix lands:
// https://bugzilla.mozilla.org/show_bug.cgi?id=683280
globalScope.PDFJS.disableWorker = true;
// getPdf()
// Convenience function to perform binary Ajax GET
// Usage: getPdf('http://...', callback)
@ -473,6 +469,7 @@ var PDFDoc = (function pdfDoc() {
this.objs = new PDFObjects();
this.pageCache = [];
this.fontsLoading = {};
this.workerReadyPromise = new Promise('workerReady');
// If worker support isn't disabled explicit and the browser has worker
@ -486,7 +483,16 @@ var PDFDoc = (function pdfDoc() {
throw 'No PDFJS.workerSrc specified';
}
var worker = new Worker(workerSrc);
var worker;
try {
worker = new Worker(workerSrc);
} catch (e) {
// Some versions of FF can't create a worker on localhost, see:
// https://bugzilla.mozilla.org/show_bug.cgi?id=683280
globalScope.PDFJS.disableWorker = true;
this.setupFakeWorker();
return;
}
var messageHandler = new MessageHandler('main', worker);
@ -507,8 +513,6 @@ var PDFDoc = (function pdfDoc() {
} else {
this.setupFakeWorker();
}
this.fontsLoading = {};
}
constructor.prototype = {