Only handle RenderingCancelledException in the viewer code, when rendering is cancelled

This commit is contained in:
Jonas Jenwald 2017-10-04 18:13:40 +02:00
parent 3d79bd5e87
commit 43134d5b33
2 changed files with 4 additions and 13 deletions

View File

@ -407,9 +407,7 @@ class PDFPageView {
this.paintTask = null; this.paintTask = null;
} }
if (((typeof PDFJSDev === 'undefined' || if (error instanceof RenderingCancelledException) {
!PDFJSDev.test('PDFJS_NEXT')) && error === 'cancelled') ||
error instanceof RenderingCancelledException) {
this.error = null; this.error = null;
return Promise.resolve(undefined); return Promise.resolve(undefined);
} }
@ -589,13 +587,8 @@ class PDFPageView {
let cancelled = false; let cancelled = false;
let ensureNotCancelled = () => { let ensureNotCancelled = () => {
if (cancelled) { if (cancelled) {
if ((typeof PDFJSDev !== 'undefined' && throw new RenderingCancelledException(
PDFJSDev.test('PDFJS_NEXT')) || PDFJS.pdfjsNext) { 'Rendering cancelled, page ' + this.id, 'svg');
throw new RenderingCancelledException(
'Rendering cancelled, page ' + this.id, 'svg');
} else {
throw 'cancelled'; // eslint-disable-line no-throw-literal
}
} }
}; };

View File

@ -303,9 +303,7 @@ class PDFThumbnailView {
this.renderTask = null; this.renderTask = null;
} }
if (((typeof PDFJSDev === 'undefined' || if (error instanceof RenderingCancelledException) {
!PDFJSDev.test('PDFJS_NEXT')) && error === 'cancelled') ||
error instanceof RenderingCancelledException) {
renderCapability.resolve(undefined); renderCapability.resolve(undefined);
return; return;
} }