From 885ba83624841a5d17521f047f69655d63634501 Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Mon, 1 Aug 2016 12:06:12 +0200 Subject: [PATCH] Add the number of `textDivs` to the `textlayerrendered` event, to avoid having to manually get that information in the event handler --- web/app.js | 7 +------ web/text_layer_builder.js | 6 +++++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/web/app.js b/web/app.js index ff23341da..e173c1ded 100644 --- a/web/app.js +++ b/web/app.js @@ -1632,18 +1632,13 @@ function webViewerPageRendered(e) { } function webViewerTextLayerRendered(e) { - var pageIndex = e.pageNumber - 1; - var pageView = PDFViewerApplication.pdfViewer.getPageView(pageIndex); - //#if !PRODUCTION if (true) { return; } //#endif //#if (FIREFOX || MOZCENTRAL) - if (pageView && pageView.textLayer && pageView.textLayer.textDivs && - pageView.textLayer.textDivs.length > 0 && - !PDFViewerApplication.supportsDocumentColors) { + if (e.numTextDivs > 0 && !PDFViewerApplication.supportsDocumentColors) { console.error(mozL10n.get('document_colors_not_allowed', null, 'PDF documents are not allowed to use their own colors: ' + '\'Allow pages to choose their own colors\' ' + diff --git a/web/text_layer_builder.js b/web/text_layer_builder.js index 65a337af0..34791d05a 100644 --- a/web/text_layer_builder.js +++ b/web/text_layer_builder.js @@ -65,6 +65,9 @@ var TextLayerBuilder = (function TextLayerBuilderClosure() { } TextLayerBuilder.prototype = { + /** + * @private + */ _finishRendering: function TextLayerBuilder_finishRendering() { this.renderingDone = true; @@ -76,7 +79,8 @@ var TextLayerBuilder = (function TextLayerBuilderClosure() { this.eventBus.dispatch('textlayerrendered', { source: this, - pageNumber: this.pageNumber + pageNumber: this.pageNumber, + numTextDivs: this.textDivs.length, }); },