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

Merge pull request #6771 from yurydelendik/requirejs

Browse source 
Removes hardcoded module loading order
This commit is contained in:
Tim van der Meij 2015-12-30 00:37:32 +01:00
commit e8db825512
25 changed files with 363 additions and 530 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/core/network.js
View file

@ -291,3 +291,17 @@ var NetworkManager = (function NetworkManagerClosure() {
return NetworkManager;
})();
//#if !(FIREFOX || MOZCENTRAL)
(function (root, factory) {
if (typeof define === 'function' && define.amd) {
define('pdfjs/core/network', ['exports'], factory);
} else if (typeof exports !== 'undefined') {
factory(exports);
} else {
factory((root.pdfjsCoreNetwork = {}));
}
}(this, function (exports) {
exports.NetworkManager = NetworkManager;
}));
//#endif

90
src/core/worker.js
View file

@ -84,7 +84,13 @@ var WorkerTask = (function WorkerTaskClosure() {
var WorkerMessageHandler = PDFJS.WorkerMessageHandler = {
setup: function wphSetup(handler, port) {
var testMessageProcessed = false;
handler.on('test', function wphSetupTest(data) {
if (testMessageProcessed) {
return; // we already processed 'test' message once
}
testMessageProcessed = true;
// check if Uint8Array can be sent to worker
if (!(data instanceof Uint8Array)) {
handler.send('test', 'main', false);
@ -611,51 +617,57 @@ var WorkerMessageHandler = PDFJS.WorkerMessageHandler = {
}
};
var consoleTimer = {};
var workerConsole = {
log: function log() {
var args = Array.prototype.slice.call(arguments);
globalScope.postMessage({
targetName: 'main',
action: 'console_log',
data: args
});
},
error: function error() {
var args = Array.prototype.slice.call(arguments);
globalScope.postMessage({
targetName: 'main',
action: 'console_error',
data: args
});
throw 'pdf.js execution error';
},
time: function time(name) {
consoleTimer[name] = Date.now();
},
timeEnd: function timeEnd(name) {
var time = consoleTimer[name];
if (!time) {
error('Unknown timer name ' + name);
}
this.log('Timer:', name, Date.now() - time);
}
};
// Worker thread?
if (typeof window === 'undefined' &&
!(typeof module !== 'undefined' && module.require)) {
function initializeWorker() {
//#if !MOZCENTRAL
if (!('console' in globalScope)) {
var consoleTimer = {};
var workerConsole = {
log: function log() {
var args = Array.prototype.slice.call(arguments);
globalScope.postMessage({
targetName: 'main',
action: 'console_log',
data: args
});
},
error: function error() {
var args = Array.prototype.slice.call(arguments);
globalScope.postMessage({
targetName: 'main',
action: 'console_error',
data: args
});
throw 'pdf.js execution error';
},
time: function time(name) {
consoleTimer[name] = Date.now();
},
timeEnd: function timeEnd(name) {
var time = consoleTimer[name];
if (!time) {
error('Unknown timer name ' + name);
}
this.log('Timer:', name, Date.now() - time);
}
};
globalScope.console = workerConsole;
}
//#endif
var handler = new MessageHandler('worker', 'main', self);
WorkerMessageHandler.setup(handler, self);
handler.send('ready', null);
}
// Worker thread (and not node.js)?
if (typeof window === 'undefined' &&
!(typeof module !== 'undefined' && module.require)) {
initializeWorker();
}
exports.WorkerTask = WorkerTask;