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

Merge pull request #3583 from yurydelendik/workerSrc

Browse Source 
Specifies default workerSrc
This commit is contained in:
Brendan Dahl 2013-08-16 13:27:58 -07:00
commit 88557041e0
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
make.js
View File

@ -226,6 +226,7 @@ target.locale = function() {
// //
target.bundle = function(args) { target.bundle = function(args) {
args = args || {}; args = args || {};
var defines = args.defines || DEFINES;
var excludes = args.excludes || []; var excludes = args.excludes || [];
target.buildnumber(); target.buildnumber();
@ -259,10 +260,10 @@ target.bundle = function(args) {
// This just preprocesses the empty pdf.js file, we don't actually want to // This just preprocesses the empty pdf.js file, we don't actually want to
// preprocess everything yet since other build targets use this file. // preprocess everything yet since other build targets use this file.
builder.preprocess(filename, dir, builder.preprocess(filename, dir, builder.merge(defines,
{BUNDLE: bundle, {BUNDLE: bundle,
BUNDLE_VERSION: bundleVersion, BUNDLE_VERSION: bundleVersion,
BUNDLE_BUILD: bundleBuild}); BUNDLE_BUILD: bundleBuild}));
} }
if (!test('-d', BUILD_DIR)) if (!test('-d', BUILD_DIR))
@ -405,7 +406,7 @@ target.firefox = function() {
FIREFOX_AMO_EXTENSION_NAME = 'pdf.js.amo.xpi'; FIREFOX_AMO_EXTENSION_NAME = 'pdf.js.amo.xpi';
target.locale(); target.locale();
target.bundle({ excludes: ['core/network.js'] }); target.bundle({ excludes: ['core/network.js'], defines: defines });
cd(ROOT_DIR); cd(ROOT_DIR);
// Clear out everything in the firefox extension build directory // Clear out everything in the firefox extension build directory
@ -517,7 +518,7 @@ target.mozcentral = function() {
'content', 'content',
'LICENSE']; 'LICENSE'];
target.bundle({ excludes: ['core/network.js'] }); target.bundle({ excludes: ['core/network.js'], defines: defines });
cd(ROOT_DIR); cd(ROOT_DIR);
// Clear out everything in the firefox extension build directory // Clear out everything in the firefox extension build directory
@ -599,7 +600,7 @@ target.b2g = function() {
var B2G_BUILD_DIR = BUILD_DIR + '/b2g/', var B2G_BUILD_DIR = BUILD_DIR + '/b2g/',
B2G_BUILD_CONTENT_DIR = B2G_BUILD_DIR + '/content/'; B2G_BUILD_CONTENT_DIR = B2G_BUILD_DIR + '/content/';
var defines = builder.merge(DEFINES, { B2G: true }); var defines = builder.merge(DEFINES, { B2G: true });
target.bundle({}); target.bundle({ defines: defines });
// Clear out everything in the b2g build directory // Clear out everything in the b2g build directory
cd(ROOT_DIR); cd(ROOT_DIR);
@ -639,7 +640,7 @@ target.chrome = function() {
var CHROME_BUILD_DIR = BUILD_DIR + '/chrome/', var CHROME_BUILD_DIR = BUILD_DIR + '/chrome/',
CHROME_BUILD_CONTENT_DIR = CHROME_BUILD_DIR + '/content/'; CHROME_BUILD_CONTENT_DIR = CHROME_BUILD_DIR + '/content/';
target.bundle({}); target.bundle({ defines: defines });
cd(ROOT_DIR); cd(ROOT_DIR);
// Clear out everything in the chrome extension build directory // Clear out everything in the chrome extension build directory

13
src/pdf.js
View File

@ -34,3 +34,16 @@ if (typeof PDFJS === 'undefined') {
//#expand __BUNDLE__ //#expand __BUNDLE__
}).call((typeof window === 'undefined') ? this : window); }).call((typeof window === 'undefined') ? this : window);
//#if !(MOZCENTRAL || FIREFOX)
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');
})();
}
//#endif