Merge pull request #6088 from Rob--W/issue-6083

Check availability of canvas & PDF before printing
This commit is contained in:
Jonas Jenwald 2015-06-06 13:58:34 +02:00
commit f943b290e6
2 changed files with 2 additions and 2 deletions

View File

@ -82,7 +82,7 @@
function renderProgress() {
var progressContainer = document.getElementById('mozPrintCallback-shim');
if (canvases) {
if (canvases && canvases.length) {
var progress = Math.round(100 * index / canvases.length);
var progressBar = progressContainer.querySelector('progress');
var progressPerc = progressContainer.querySelector('.relative-progress');

View File

@ -1101,7 +1101,7 @@ var PDFViewerApplication = {
var alertNotReady = false;
var i, ii;
if (!this.pagesCount) {
if (!this.pdfDocument || !this.pagesCount) {
alertNotReady = true;
} else {
for (i = 0, ii = this.pagesCount; i < ii; ++i) {