From 7dc1bbf05e29fac0efa20d20543f518229f235bc Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Mon, 1 Mar 2021 16:25:12 +0100 Subject: [PATCH 1/2] Enable scripting by default in the development viewer Given that scripting is now enabled in Firefox Nightly (but only there), it seems weird to not have scripting enabled by default in `gulp server` mode. --- web/app_options.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/app_options.js b/web/app_options.js index 2b67f4e0a..f88932034 100644 --- a/web/app_options.js +++ b/web/app_options.js @@ -67,7 +67,9 @@ const defaultOptions = { }, enableScripting: { /** @type {boolean} */ - value: typeof PDFJSDev !== "undefined" && PDFJSDev.test("TESTING"), + value: + typeof PDFJSDev === "undefined" || + PDFJSDev.test("!PRODUCTION || TESTING"), kind: OptionKind.VIEWER + OptionKind.PREFERENCE, }, enableWebGL: { From bd7868f54c2498eecc458ed67fb0fba47ce0a35a Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Mon, 1 Mar 2021 16:25:18 +0100 Subject: [PATCH 2/2] Remove the standalone `acroforms` example At this point in time the standalone `acroforms` example is no longer needed, since both the `simpleviewer` and `singlepageviewer` examples already support AcroForms by default. Moreover, the `acroforms` example no longer illustrate best practices, given the direct usage of `PDFPageView` for a multipage document. --- examples/acroforms/README.md | 11 ------ examples/acroforms/acroforms.html | 44 ------------------------ examples/acroforms/acroforms.js | 56 ------------------------------- 3 files changed, 111 deletions(-) delete mode 100644 examples/acroforms/README.md delete mode 100644 examples/acroforms/acroforms.html delete mode 100644 examples/acroforms/acroforms.js diff --git a/examples/acroforms/README.md b/examples/acroforms/README.md deleted file mode 100644 index 6cde5bfd6..000000000 --- a/examples/acroforms/README.md +++ /dev/null @@ -1,11 +0,0 @@ -## Overview - -Example to demonstrate PDF.js library usage for rendering files with AcroForms. - -## Getting started - -Build and install PDF.js using `gulp dist-install` and run `gulp server` to -start a web server. You can then work with the example at -http://localhost:8888/examples/acroforms/acroforms.html. - -Refer to `acroforms.js` for the source code of the example. diff --git a/examples/acroforms/acroforms.html b/examples/acroforms/acroforms.html deleted file mode 100644 index 7768d2b75..000000000 --- a/examples/acroforms/acroforms.html +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - AcroForms example - - - - - - - - - - -
- - - - diff --git a/examples/acroforms/acroforms.js b/examples/acroforms/acroforms.js deleted file mode 100644 index 8f3e99660..000000000 --- a/examples/acroforms/acroforms.js +++ /dev/null @@ -1,56 +0,0 @@ -/* Copyright 2017 Mozilla Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -"use strict"; - -pdfjsLib.GlobalWorkerOptions.workerSrc = - "../../node_modules/pdfjs-dist/build/pdf.worker.js"; - -var DEFAULT_URL = "../../test/pdfs/prefilled_f1040.pdf"; -var DEFAULT_SCALE = 1.0; - -var container = document.getElementById("pageContainer"); - -var eventBus = new pdfjsViewer.EventBus(); - -// Fetch the PDF document from the URL using promises. -var loadingTask = pdfjsLib.getDocument(DEFAULT_URL); -loadingTask.promise.then(function (doc) { - // Use a promise to fetch and render the next page. - var promise = Promise.resolve(); - - for (var i = 1; i <= doc.numPages; i++) { - promise = promise.then( - function (pageNum) { - return doc.getPage(pageNum).then(function (pdfPage) { - // Create the page view. - var pdfPageView = new pdfjsViewer.PDFPageView({ - container, - id: pageNum, - scale: DEFAULT_SCALE, - defaultViewport: pdfPage.getViewport({ scale: DEFAULT_SCALE }), - eventBus, - annotationLayerFactory: new pdfjsViewer.DefaultAnnotationLayerFactory(), - renderInteractiveForms: true, - }); - - // Associate the actual page with the view and draw it. - pdfPageView.setPdfPage(pdfPage); - return pdfPageView.draw(); - }); - }.bind(null, i) - ); - } -});