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

Tweak PDFPageView to reflect that this.annotationLayer is an AnnotationsLayerBuilder instance, instead of a DOM element (PR 5552 follow-up)

Browse Source 
In PR 5552, specifically commit 9f384bbb41, the meaning of `this.annotationLayer` changed in `PDFPageView`. Previously it referred directly to a DOM element, but now it's instead an instance of `AnnotationsLayerBuilder`.
This patch tweaks things so that we won't try to hide a non-existent `annotationLayer` div in `PDFPageView_reset`, and also so that we don't attempt to insert empty (`null`) DOM elements in `PDFPageView_draw`.
This commit is contained in:
Jonas Jenwald 2015-09-23 19:34:11 +02:00
parent 20b5814249
commit c7fd7f898f
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web/pdf_page_view.js
View File

@ -129,12 +129,10 @@ var PDFPageView = (function PDFPageViewClosure() {
} }
div.removeAttribute('data-loaded'); div.removeAttribute('data-loaded');
if (keepAnnotations) { if (currentAnnotationNode) {
if (this.annotationLayer) { // Hide annotationLayer until all elements are resized
// Hide annotationLayer until all elements are resized // so they are not displayed on the already-resized page
// so they are not displayed on the already-resized page this.annotationLayer.hide();
this.annotationLayer.hide();
}
} else { } else {
this.annotationLayer = null; this.annotationLayer = null;
} }
@ -303,7 +301,7 @@ var PDFPageView = (function PDFPageViewClosure() {
var canvas = document.createElement('canvas'); var canvas = document.createElement('canvas');
canvas.id = 'page' + this.id; canvas.id = 'page' + this.id;
canvasWrapper.appendChild(canvas); canvasWrapper.appendChild(canvas);
if (this.annotationLayer) { if (this.annotationLayer && this.annotationLayer.div) {
// annotationLayer needs to stay on top // annotationLayer needs to stay on top
div.insertBefore(canvasWrapper, this.annotationLayer.div); div.insertBefore(canvasWrapper, this.annotationLayer.div);
} else { } else {
@ -350,7 +348,7 @@ var PDFPageView = (function PDFPageViewClosure() {
textLayerDiv.className = 'textLayer'; textLayerDiv.className = 'textLayer';
textLayerDiv.style.width = canvas.style.width; textLayerDiv.style.width = canvas.style.width;
textLayerDiv.style.height = canvas.style.height; textLayerDiv.style.height = canvas.style.height;
if (this.annotationLayer) { if (this.annotationLayer && this.annotationLayer.div) {
// annotationLayer needs to stay on top // annotationLayer needs to stay on top
div.insertBefore(textLayerDiv, this.annotationLayer.div); div.insertBefore(textLayerDiv, this.annotationLayer.div);
} else { } else {