mirror of
https://github.com/mozilla/pdf.js.git
synced 2025-04-20 15:18:08 +02:00
fix merge conflicts
This commit is contained in:
commit
ff2dea38ec
16 changed files with 765 additions and 627 deletions
|
@ -73,26 +73,16 @@ function nextTask() {
|
|||
|
||||
log('Loading file "' + task.file + '"\n');
|
||||
|
||||
var r = new XMLHttpRequest();
|
||||
r.open('GET', task.file);
|
||||
r.mozResponseType = r.responseType = 'arraybuffer';
|
||||
r.onreadystatechange = function nextTaskOnreadystatechange() {
|
||||
getPdf(task.file, function nextTaskGetPdf(data) {
|
||||
var failure;
|
||||
if (r.readyState == 4) {
|
||||
var data = r.mozResponseArrayBuffer || r.mozResponse ||
|
||||
r.responseArrayBuffer || r.response;
|
||||
|
||||
try {
|
||||
task.pdfDoc = new PDFDoc(data);
|
||||
} catch (e) {
|
||||
failure = 'load PDF doc : ' + e.toString();
|
||||
}
|
||||
|
||||
task.pageNum = 1;
|
||||
nextPage(task, failure);
|
||||
try {
|
||||
task.pdfDoc = new PDFDoc(data);
|
||||
} catch (e) {
|
||||
failure = 'load PDF doc : ' + e.toString();
|
||||
}
|
||||
};
|
||||
r.send(null);
|
||||
task.pageNum = 1;
|
||||
nextPage(task, failure);
|
||||
});
|
||||
}
|
||||
|
||||
function isLastPage(task) {
|
||||
|
|
1
test/pdfs/unix01.pdf.link
Normal file
1
test/pdfs/unix01.pdf.link
Normal file
|
@ -0,0 +1 @@
|
|||
https://docs.rice.edu/confluence/download/attachments/4588376/unix01.pdf?version=1
|
|
@ -128,6 +128,12 @@
|
|||
"rounds": 1,
|
||||
"type": "eq"
|
||||
},
|
||||
{ "id": "unix01",
|
||||
"file": "pdfs/unix01.pdf",
|
||||
"link": true,
|
||||
"rounds": 1,
|
||||
"type": "eq"
|
||||
},
|
||||
{ "id": "fips197",
|
||||
"file": "pdfs/fips197.pdf",
|
||||
"link": true,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue