mirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-19 14:48:08 +02:00
Code Activity

Merge pull request #6595 from yurydelendik/currentscript

Browse source 
Uses document.currentScript for pdf.worker.js path.
This commit is contained in:
Jonas Jenwald 2015-11-06 17:28:20 +01:00
commit 1e0bd07d8d
8 changed files with 32 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
examples/components/pageviewer.js
View file

@ -20,11 +20,9 @@ if (!PDFJS.PDFViewer || !PDFJS.getDocument) {
' `node make generic components`');
}
// In cases when the pdf.worker.js is located at the different folder than the
// pdf.js's one, or the pdf.js is executed via eval(), the workerSrc property
// shall be specified.
// The workerSrc property shall be specified.
//
// PDFJS.workerSrc = '../../build/pdf.worker.js';
PDFJS.workerSrc = '../../build/pdf.worker.js';
// Some PDFs need external cmaps.
//

6
examples/components/simpleviewer.js
View file

@ -20,11 +20,9 @@ if (!PDFJS.PDFViewer || !PDFJS.getDocument) {
' `node make generic components`');
}
// In cases when the pdf.worker.js is located at the different folder than the
// pdf.js's one, or the pdf.js is executed via eval(), the workerSrc property
// shall be specified.
// The workerSrc property shall be specified.
//
// PDFJS.workerSrc = '../../build/pdf.worker.js';
PDFJS.workerSrc = '../../build/pdf.worker.js';
// Some PDFs need external cmaps.
//

6
examples/learning/helloworld.html
View file

@ -30,11 +30,9 @@
// PDFJS.disableWorker = true;
//
// In cases when the pdf.worker.js is located at the different folder than the
// pdf.js's one, or the pdf.js is executed via eval(), the workerSrc property
// shall be specified.
// The workerSrc property shall be specified.
//
// PDFJS.workerSrc = '../../build/pdf.worker.js';
PDFJS.workerSrc = '../../build/pdf.worker.js';
//
// Asynchronous download PDF

7
examples/learning/helloworld64.html
View file

@ -40,11 +40,10 @@
//
// PDFJS.disableWorker = true;
// In cases when the pdf.worker.js is located at the different folder than the
// pdf.js's one, or the pdf.js is executed via eval(), the workerSrc property
// shall be specified.
//
// PDFJS.workerSrc = '../../build/pdf.worker.js';
// The workerSrc property shall be specified.
//
PDFJS.workerSrc = '../../build/pdf.worker.js';
// Opening PDF by passing its binary data as a string. It is still preferable
// to use Uint8Array, but string or array-like structure will work too.

2
examples/text-only/pdf2svg.js
View file

@ -18,6 +18,8 @@ var PAGE_NUMBER = 1;
var PAGE_SCALE = 1.5;
var SVG_NS = 'http://www.w3.org/2000/svg';
PDFJS.workerSrc = '../../build/pdf.worker.js';
function buildSVG(viewport, textContent) {
// Building SVG with size of the viewport (for simplicity)
var svg = document.createElementNS(SVG_NS, 'svg:svg');

4
src/display/api.js
View file

@ -75,7 +75,9 @@ PDFJS.disableWorker = (PDFJS.disableWorker === undefined ?
/**
* Path and filename of the worker file. Required when the worker is enabled in
* development mode. If unspecified in the production build, the worker will be
* loaded based on the location of the pdf.js file.
* loaded based on the location of the pdf.js file. It is recommended that
* the workerSrc is set in a custom application to prevent issues caused by
* third-party frameworks and libraries.
* @var {string}
*/
PDFJS.workerSrc = (PDFJS.workerSrc === undefined ? null : PDFJS.workerSrc);

6
src/pdf.js
View file

@ -42,10 +42,8 @@ if (!PDFJS.workerSrc && typeof document !== 'undefined') {
// workerSrc is not set -- using last script url to define default location
PDFJS.workerSrc = (function () {
'use strict';
var scriptTagContainer = document.body ||
document.getElementsByTagName('head')[0];
var pdfjsSrc = scriptTagContainer.lastChild.src;
return pdfjsSrc && pdfjsSrc.replace(/\.js$/i, '.worker.js');
var pdfJsSrc = document.currentScript.src;
return pdfJsSrc && pdfJsSrc.replace(/\.js$/i, '.worker.js');
})();
}
//#endif

16
web/compatibility.js
View file

@ -577,3 +577,19 @@ if (typeof PDFJS === 'undefined') {
PDFJS.disableFullscreen = true;
}
})();
// Provides document.currentScript support
// Support: IE, Chrome<29.
(function checkCurrentScript() {
if ('currentScript' in document) {
return;
}
Object.defineProperty(document, 'currentScript', {
get: function () {
var scripts = document.getElementsByTagName('script');
return scripts[scripts.length - 1];
},
enumerable: true,
configurable: true
});
})();