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

Merge pull request #7030 from Snuffleupagus/PDFThumbnailView-remove-hasImage

Browse Source 
Remove the `hasImage` property from `PDFThumbnailView`
This commit is contained in:
Tim van der Meij 2016-02-25 23:17:48 +01:00
commit 2b813c0ca4
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web/pdf_thumbnail_view.js
View File

@ -77,7 +77,6 @@ var PDFThumbnailView = (function PDFThumbnailViewClosure() {
this.linkService = linkService; this.linkService = linkService;
this.renderingQueue = renderingQueue; this.renderingQueue = renderingQueue;
this.hasImage = false;
this.resume = null; this.resume = null;
this.renderingState = RenderingStates.INITIAL; this.renderingState = RenderingStates.INITIAL;
@ -133,7 +132,6 @@ var PDFThumbnailView = (function PDFThumbnailViewClosure() {
if (this.renderTask) { if (this.renderTask) {
this.renderTask.cancel(); this.renderTask.cancel();
} }
this.hasImage = false;
this.resume = null; this.resume = null;
this.renderingState = RenderingStates.INITIAL; this.renderingState = RenderingStates.INITIAL;
@ -238,11 +236,9 @@ var PDFThumbnailView = (function PDFThumbnailViewClosure() {
draw: function PDFThumbnailView_draw() { draw: function PDFThumbnailView_draw() {
if (this.renderingState !== RenderingStates.INITIAL) { if (this.renderingState !== RenderingStates.INITIAL) {
console.error('Must be in new state before drawing'); console.error('Must be in new state before drawing');
}
if (this.hasImage) {
return Promise.resolve(undefined); return Promise.resolve(undefined);
} }
this.hasImage = true;
this.renderingState = RenderingStates.RUNNING; this.renderingState = RenderingStates.RUNNING;
var resolveRenderPromise, rejectRenderPromise; var resolveRenderPromise, rejectRenderPromise;
@ -263,6 +259,7 @@ var PDFThumbnailView = (function PDFThumbnailViewClosure() {
rejectRenderPromise(error); rejectRenderPromise(error);
return; return;
} }
self.renderingState = RenderingStates.FINISHED; self.renderingState = RenderingStates.FINISHED;
self._convertCanvasToImage(); self._convertCanvasToImage();
@ -306,14 +303,17 @@ var PDFThumbnailView = (function PDFThumbnailViewClosure() {
}, },
setImage: function PDFThumbnailView_setImage(pageView) { setImage: function PDFThumbnailView_setImage(pageView) {
if (this.renderingState !== RenderingStates.INITIAL) {
return;
}
var img = pageView.canvas; var img = pageView.canvas;
if (this.hasImage || !img) { if (!img) {
return; return;
} }
if (!this.pdfPage) { if (!this.pdfPage) {
this.setPdfPage(pageView.pdfPage); this.setPdfPage(pageView.pdfPage);
} }
this.hasImage = true;
this.renderingState = RenderingStates.FINISHED; this.renderingState = RenderingStates.FINISHED;
var ctx = this._getPageDrawContext(true); var ctx = this._getPageDrawContext(true);