From a8de614a9fead1dc4652ae01423e1305c554d017 Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Sat, 22 Aug 2020 13:58:33 +0200 Subject: [PATCH] Also enable `renderInteractiveForms` by default in the viewer components (PR 12201 follow-up) Given that `renderInteractiveForms` is now enabled by default in "full" viewer, it seems reasonable to enable it by default in the viewer components as well. Especially considering that it's simple to disable, when creating the affected components, for anyone implementing their own viewer. --- src/display/annotation_layer.js | 5 ++++- web/annotation_layer_builder.js | 4 ++-- web/base_viewer.js | 7 +++++-- web/interfaces.js | 2 +- web/pdf_page_view.js | 7 +++++-- 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/display/annotation_layer.js b/src/display/annotation_layer.js index f1385f86d..263249577 100644 --- a/src/display/annotation_layer.js +++ b/src/display/annotation_layer.js @@ -1500,7 +1500,10 @@ class AnnotationLayer { linkService: parameters.linkService, downloadManager: parameters.downloadManager, imageResourcesPath: parameters.imageResourcesPath || "", - renderInteractiveForms: parameters.renderInteractiveForms || false, + renderInteractiveForms: + typeof parameters.renderInteractiveForms === "boolean" + ? parameters.renderInteractiveForms + : true, svgFactory: new DOMSVGFactory(), annotationStorage: parameters.annotationStorage || new AnnotationStorage(), diff --git a/web/annotation_layer_builder.js b/web/annotation_layer_builder.js index 9b1a633b7..ed50d0711 100644 --- a/web/annotation_layer_builder.js +++ b/web/annotation_layer_builder.js @@ -41,7 +41,7 @@ class AnnotationLayerBuilder { downloadManager, annotationStorage = null, imageResourcesPath = "", - renderInteractiveForms = false, + renderInteractiveForms = true, l10n = NullL10n, }) { this.pageDiv = pageDiv; @@ -133,7 +133,7 @@ class DefaultAnnotationLayerFactory { pdfPage, annotationStorage = null, imageResourcesPath = "", - renderInteractiveForms = false, + renderInteractiveForms = true, l10n = NullL10n ) { return new AnnotationLayerBuilder({ diff --git a/web/base_viewer.js b/web/base_viewer.js index e4dce389c..4e1cbe284 100644 --- a/web/base_viewer.js +++ b/web/base_viewer.js @@ -65,7 +65,7 @@ const DEFAULT_CACHE_SIZE = 10; * @property {string} [imageResourcesPath] - Path for image resources, mainly * mainly for annotation icons. Include trailing slash. * @property {boolean} [renderInteractiveForms] - Enables rendering of - * interactive form elements. The default is `false`. + * interactive form elements. The default value is `true`. * @property {boolean} [enablePrintAutoRotate] - Enables automatic rotation of * landscape pages upon printing. The default is `false`. * @property {string} renderer - 'canvas' or 'svg'. The default is 'canvas'. @@ -152,7 +152,10 @@ class BaseViewer { ? options.textLayerMode : TextLayerMode.ENABLE; this.imageResourcesPath = options.imageResourcesPath || ""; - this.renderInteractiveForms = options.renderInteractiveForms || false; + this.renderInteractiveForms = + typeof options.renderInteractiveForms === "boolean" + ? options.renderInteractiveForms + : true; this.enablePrintAutoRotate = options.enablePrintAutoRotate || false; this.renderer = options.renderer || RendererType.CANVAS; this.enableWebGL = options.enableWebGL || false; diff --git a/web/interfaces.js b/web/interfaces.js index 81dd4b2e0..b05fbe2a9 100644 --- a/web/interfaces.js +++ b/web/interfaces.js @@ -178,7 +178,7 @@ class IPDFAnnotationLayerFactory { pdfPage, annotationStorage = null, imageResourcesPath = "", - renderInteractiveForms = false, + renderInteractiveForms = true, l10n = undefined ) {} } diff --git a/web/pdf_page_view.js b/web/pdf_page_view.js index e0eeee9fe..2ac11aa69 100644 --- a/web/pdf_page_view.js +++ b/web/pdf_page_view.js @@ -50,7 +50,7 @@ import { viewerCompatibilityParams } from "./viewer_compatibility.js"; * @property {string} [imageResourcesPath] - Path for image resources, mainly * for annotation icons. Include trailing slash. * @property {boolean} renderInteractiveForms - Turns on rendering of - * interactive form elements. The default is `false`. + * interactive form elements. The default value is `true`. * @property {string} renderer - 'canvas' or 'svg'. The default is 'canvas'. * @property {boolean} [enableWebGL] - Enables WebGL accelerated rendering for * some operations. The default value is `false`. @@ -90,7 +90,10 @@ class PDFPageView { ? options.textLayerMode : TextLayerMode.ENABLE; this.imageResourcesPath = options.imageResourcesPath || ""; - this.renderInteractiveForms = options.renderInteractiveForms || false; + this.renderInteractiveForms = + typeof options.renderInteractiveForms === "boolean" + ? options.renderInteractiveForms + : true; this.useOnlyCssZoom = options.useOnlyCssZoom || false; this.maxCanvasPixels = options.maxCanvasPixels || MAX_CANVAS_PIXELS;