|
|
@ -1986,7 +1986,7 @@ |
|
|
|
} |
|
|
|
} |
|
|
|
if (error === 'cancelled') { |
|
|
|
if (error === 'cancelled') { |
|
|
|
self.error = null; |
|
|
|
self.error = null; |
|
|
|
return; |
|
|
|
return Promise.resolve(undefined); |
|
|
|
} |
|
|
|
} |
|
|
|
self.renderingState = RenderingStates.FINISHED; |
|
|
|
self.renderingState = RenderingStates.FINISHED; |
|
|
|
if (self.loadingIconDiv) { |
|
|
|
if (self.loadingIconDiv) { |
|
|
@ -2012,21 +2012,25 @@ |
|
|
|
pageNumber: self.id, |
|
|
|
pageNumber: self.id, |
|
|
|
cssTransform: false |
|
|
|
cssTransform: false |
|
|
|
}); |
|
|
|
}); |
|
|
|
|
|
|
|
if (error) { |
|
|
|
|
|
|
|
return Promise.reject(error); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
return Promise.resolve(undefined); |
|
|
|
}; |
|
|
|
}; |
|
|
|
var paintTask = this.renderer === RendererType.SVG ? this.paintOnSvg(canvasWrapper) : this.paintOnCanvas(canvasWrapper); |
|
|
|
var paintTask = this.renderer === RendererType.SVG ? this.paintOnSvg(canvasWrapper) : this.paintOnCanvas(canvasWrapper); |
|
|
|
paintTask.onRenderContinue = renderContinueCallback; |
|
|
|
paintTask.onRenderContinue = renderContinueCallback; |
|
|
|
this.paintTask = paintTask; |
|
|
|
this.paintTask = paintTask; |
|
|
|
var resultPromise = paintTask.promise.then(function () { |
|
|
|
var resultPromise = paintTask.promise.then(function () { |
|
|
|
finishPaintTask(null); |
|
|
|
return finishPaintTask(null).then(function () { |
|
|
|
if (textLayer) { |
|
|
|
if (textLayer) { |
|
|
|
pdfPage.getTextContent({ normalizeWhitespace: true }).then(function textContentResolved(textContent) { |
|
|
|
pdfPage.getTextContent({ normalizeWhitespace: true }).then(function textContentResolved(textContent) { |
|
|
|
textLayer.setTextContent(textContent); |
|
|
|
textLayer.setTextContent(textContent); |
|
|
|
textLayer.render(TEXT_LAYER_RENDER_DELAY); |
|
|
|
textLayer.render(TEXT_LAYER_RENDER_DELAY); |
|
|
|
}); |
|
|
|
}); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
}); |
|
|
|
}, function (reason) { |
|
|
|
}, function (reason) { |
|
|
|
finishPaintTask(reason); |
|
|
|
return finishPaintTask(reason); |
|
|
|
throw reason; |
|
|
|
|
|
|
|
}); |
|
|
|
}); |
|
|
|
if (this.annotationLayerFactory) { |
|
|
|
if (this.annotationLayerFactory) { |
|
|
|
if (!this.annotationLayer) { |
|
|
|
if (!this.annotationLayer) { |
|
|
|