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

Merge pull request #8157 from Snuffleupagus/api-RenderTask-cancel-Error

Browse source 
[api-minor] Reject the `RenderTask` with an actual `Error`, instead of just a `string`, when rendering is cancelled
This commit is contained in:
Yury Delendik 2017-04-04 09:38:47 -05:00 • committed by GitHub
commit 31f8875614
12 changed files with 106 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
web/app.js
View file

@ -117,6 +117,7 @@ function configure(PDFJS) {
PDFJS.cMapUrl = '../external/bcmaps/';
PDFJS.cMapPacked = true;
PDFJS.workerSrc = '../src/worker_loader.js';
PDFJS.pdfjsNext = true;
} else {
PDFJS.cMapUrl = '../web/cmaps/';
PDFJS.cMapPacked = true;

12
web/pdf_page_view.js
View file

@ -441,7 +441,9 @@ var PDFPageView = (function PDFPageViewClosure() {
self.paintTask = null;
}
if (error === 'cancelled') {
if (((typeof PDFJSDev === 'undefined' ||
!PDFJSDev.test('PDFJS_NEXT')) && error === 'cancelled') ||
error instanceof pdfjsLib.RenderingCancelledException) {
self.error = null;
return Promise.resolve(undefined);
}
@ -632,7 +634,13 @@ var PDFPageView = (function PDFPageViewClosure() {
var cancelled = false;
var ensureNotCancelled = function () {
if (cancelled) {
throw 'cancelled';
if ((typeof PDFJSDev !== 'undefined' &&
PDFJSDev.test('PDFJS_NEXT')) || pdfjsLib.PDFJS.pdfjsNext) {
throw new pdfjsLib.RenderingCancelledException(
'Rendering cancelled, page ' + self.id, 'svg');
} else {
throw 'cancelled'; // eslint-disable-line no-throw-literal
}
}
};