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

Fix intermittent blank page on fast zoom.

Browse Source
This commit is contained in:
Brendan Dahl 2013-08-05 16:34:57 -07:00
parent 029b970871
commit d85e38d629
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api.js
View File

@ -852,7 +852,7 @@ var InternalRenderTask = (function InternalRenderTaskClosure() {
cancel: function InternalRenderTask_cancel() { cancel: function InternalRenderTask_cancel() {
this.running = false; this.running = false;
this.cancelled = true; this.cancelled = true;
this.callback(); this.callback('cancelled');
}, },
operatorListChanged: function InternalRenderTask_operatorListChanged() { operatorListChanged: function InternalRenderTask_operatorListChanged() {

15
web/viewer.js
View File

@ -1560,7 +1560,6 @@ var PageView = function pageView(container, id, scale,
this.update = function pageViewUpdate(scale, rotation) { this.update = function pageViewUpdate(scale, rotation) {
if (this.renderTask) { if (this.renderTask) {
this.renderTask.cancel(); this.renderTask.cancel();
this.renderTask = null;
} }
this.resume = null; this.resume = null;
this.renderingState = RenderingStates.INITIAL; this.renderingState = RenderingStates.INITIAL;
@ -1828,8 +1827,18 @@ var PageView = function pageView(container, id, scale,
var self = this; var self = this;
function pageViewDrawCallback(error) { function pageViewDrawCallback(error) {
// The renderTask may have been replaced by a new one, so only remove the
// reference to the renderTask if it matches the one that is triggering
// this callback.
if (renderTask === self.renderTask) {
self.renderTask = null;
}
if (error === 'cancelled') {
return;
}
self.renderingState = RenderingStates.FINISHED; self.renderingState = RenderingStates.FINISHED;
self.renderTask = null;
if (self.loadingIconDiv) { if (self.loadingIconDiv) {
div.removeChild(self.loadingIconDiv); div.removeChild(self.loadingIconDiv);
@ -1890,7 +1899,7 @@ var PageView = function pageView(container, id, scale,
cont(); cont();
} }
}; };
this.renderTask = this.pdfPage.render(renderContext); var renderTask = this.renderTask = this.pdfPage.render(renderContext);
this.renderTask.then( this.renderTask.then(
function pdfPageRenderCallback() { function pdfPageRenderCallback() {