Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8291 from Snuffleupagus/pr-8157

Browse Source 
Ensure that `PDFThumbnailView.draw` is able to handle `RenderingCancelledException` correctly (PR 8157 follow-up)
This commit is contained in:
Tim van der Meij 2017-04-15 20:17:03 +02:00 committed by GitHub
commit c6e8ca863e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/pdf_thumbnail_view.js
View File

@ -14,6 +14,7 @@
*/ */
import { getOutputScale, mozL10n } from './ui_utils'; import { getOutputScale, mozL10n } from './ui_utils';
import { RenderingCancelledException } from './pdfjs';
import { RenderingStates } from './pdf_rendering_queue'; import { RenderingStates } from './pdf_rendering_queue';
var THUMBNAIL_WIDTH = 98; // px var THUMBNAIL_WIDTH = 98; // px
@ -288,8 +289,11 @@ var PDFThumbnailView = (function PDFThumbnailViewClosure() {
if (renderTask === self.renderTask) { if (renderTask === self.renderTask) {
self.renderTask = null; self.renderTask = null;
} }
if (error === 'cancelled') {
rejectRenderPromise(error); if (((typeof PDFJSDev === 'undefined' ||
!PDFJSDev.test('PDFJS_NEXT')) && error === 'cancelled') ||
error instanceof RenderingCancelledException) {
resolveRenderPromise(undefined);
return; return;
} }