Viewer working with dev version

This commit is contained in:
Artur Adib 2011-10-25 15:43:41 -07:00
parent b049185d51
commit 2e0af76865
4 changed files with 44 additions and 26 deletions

View File

@ -4,7 +4,15 @@
var ERRORS = 0, WARNINGS = 1, TODOS = 5;
var verbosity = WARNINGS;
//
var useWorker = false;
// The global PDF object exposes the API
// In production, it will be declared outside a global wrapper
// In development, it will be declared here
if (typeof PDF === 'undefined') {
var PDF = {};
}
// getPdf()
// Convenience function to perform binary Ajax GET
// Usage: getPdf('http://...', callback)
@ -13,7 +21,6 @@ var verbosity = WARNINGS;
// [,progress:Function, error:Function]
// },
// callback)
//
function getPdf(arg, callback) {
var params = arg;
if (typeof arg === 'string')
@ -39,6 +46,7 @@ function getPdf(arg, callback) {
};
xhr.send(null);
}
PDF.getPdf = getPdf;
var Page = (function pagePage() {
function constructor(xref, pageNumber, pageDict, ref) {
@ -460,7 +468,7 @@ var PDFDoc = (function() {
this.pageCache = [];
if (useWorker) {
var worker = new Worker('../build/pdf.js');
var worker = new Worker('../src/worker_loader.js');
} else {
// If we don't use a worker, just post/sendMessage to the main thread.
var worker = {
@ -597,3 +605,4 @@ var PDFDoc = (function() {
return constructor;
})();
PDF.PDFDoc = PDFDoc;

View File

@ -3,30 +3,10 @@
var PDF = {};
(function(globalScope) {
(function() {
// Use strict in our context only - users might not want it
'use strict';
// Set this to true if you want to use workers.
var useWorker = false;
var console;
// Files are inserted below - see Makefile
/* INSERT_POINT */
// Worker-specific
if (typeof window !== 'undefined') {
console = window.console;
} else {
var consoleTimer = {};
console = workerConsole;
// Listen for messages from the main thread.
var handler = new MessageHandler('worker_processor', globalScope);
WorkerProcessorHandler.setup(handler);
}
// Expose API in global object
PDF.PDFDoc = PDFDoc;
PDF.getPdf = getPdf;
})(this);
})();

View File

@ -138,6 +138,8 @@ var WorkerProcessorHandler = {
}
};
var consoleTimer = {};
var workerConsole = {
log: function log() {
var args = Array.prototype.slice.call(arguments);
@ -167,3 +169,12 @@ var workerConsole = {
this.log('Timer:', name, Date.now() - time);
}
};
// Worker thread?
if (typeof window === 'undefined') {
console = workerConsole;
// Listen for messages from the main thread.
var handler = new MessageHandler('worker_processor', this);
WorkerProcessorHandler.setup(handler);
}

View File

@ -3,10 +3,28 @@
<head>
<title>Simple pdf.js page viewer</title>
<link rel="stylesheet" href="viewer.css"/>
<script type="text/javascript" src="../src/core.js"></script>
<script type="text/javascript" src="../src/util.js"></script>
<script type="text/javascript" src="../src/canvas.js"></script>
<script type="text/javascript" src="../src/obj.js"></script>
<script type="text/javascript" src="../src/function.js"></script>
<script type="text/javascript" src="../src/charsets.js"></script>
<script type="text/javascript" src="../src/cidmaps.js"></script>
<script type="text/javascript" src="../src/colorspace.js"></script>
<script type="text/javascript" src="../src/crypto.js"></script>
<script type="text/javascript" src="../src/evaluator.js"></script>
<script type="text/javascript" src="../src/fonts.js"></script>
<script type="text/javascript" src="../src/glyphlist.js"></script>
<script type="text/javascript" src="../src/image.js"></script>
<script type="text/javascript" src="../src/metrics.js"></script>
<script type="text/javascript" src="../src/parser.js"></script>
<script type="text/javascript" src="../src/pattern.js"></script>
<script type="text/javascript" src="../src/stream.js"></script>
<script type="text/javascript" src="../src/worker.js"></script>
<script type="text/javascript" src="compatibility.js"></script>
<script type="text/javascript" src="viewer.js"></script>
<script type="text/javascript" src="../build/pdf.js"></script>
</head>
<body>