From f87ec67ab1f0280631918a035d460e46eee7622a Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Mon, 31 Jul 2023 11:20:14 +0200 Subject: [PATCH] [api-major] Remove various deprecated functionality and options --- src/display/api.js | 20 -------------------- src/display/text_layer.js | 30 +----------------------------- web/app.js | 16 ---------------- web/pdf_find_controller.js | 12 ------------ web/pdf_page_view.js | 7 ------- web/pdf_viewer.js | 7 ------- 6 files changed, 1 insertion(+), 91 deletions(-) diff --git a/src/display/api.js b/src/display/api.js index 9030e0743..df7ced572 100644 --- a/src/display/api.js +++ b/src/display/api.js @@ -770,26 +770,6 @@ class PDFDocumentProxy { this._pdfInfo = pdfInfo; this._transport = transport; - if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) { - Object.defineProperty(this, "getJavaScript", { - value: () => { - deprecated( - "`PDFDocumentProxy.getJavaScript`, " + - "please use `PDFDocumentProxy.getJSActions` instead." - ); - return this.getJSActions().then(js => { - if (!js) { - return js; - } - const jsArr = []; - for (const name in js) { - jsArr.push(...js[name]); - } - return jsArr; - }); - }, - }); - } if (typeof PDFJSDev === "undefined" || PDFJSDev.test("TESTING")) { // For testing purposes. Object.defineProperty(this, "getXFADatasets", { diff --git a/src/display/text_layer.js b/src/display/text_layer.js index d7682e519..ccf3eed31 100644 --- a/src/display/text_layer.js +++ b/src/display/text_layer.js @@ -22,7 +22,7 @@ import { PromiseCapability, Util, } from "../shared/util.js"; -import { deprecated, setLayerDimensions } from "./display_utils.js"; +import { setLayerDimensions } from "./display_utils.js"; /** * Text layer render parameters. @@ -456,34 +456,6 @@ class TextLayerRenderTask { * @returns {TextLayerRenderTask} */ function renderTextLayer(params) { - if ( - (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) && - !params.textContentSource && - (params.textContent || params.textContentStream) - ) { - deprecated( - "The TextLayerRender `textContent`/`textContentStream` parameters " + - "will be removed in the future, please use `textContentSource` instead." - ); - params.textContentSource = params.textContent || params.textContentStream; - } - if (typeof PDFJSDev !== "undefined" && PDFJSDev.test("GENERIC && !TESTING")) { - const { container, viewport } = params; - const style = getComputedStyle(container); - const visibility = style.getPropertyValue("visibility"); - const scaleFactor = parseFloat(style.getPropertyValue("--scale-factor")); - - if ( - visibility === "visible" && - (!scaleFactor || Math.abs(scaleFactor - viewport.scale) > 1e-5) - ) { - console.error( - "The `--scale-factor` CSS-variable must be set, " + - "to the same value as `viewport.scale`, " + - "either on the `container`-element itself or higher up in the DOM." - ); - } - } const task = new TextLayerRenderTask(params); task._render(); return task; diff --git a/web/app.js b/web/app.js index 028f0b146..68c197930 100644 --- a/web/app.js +++ b/web/app.js @@ -1040,22 +1040,6 @@ const PDFViewerApplication = { * @returns {Promise} - Promise that is resolved when the document is opened. */ async open(args) { - if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) { - let deprecatedArgs = false; - if (typeof args === "string") { - args = { url: args }; // URL - deprecatedArgs = true; - } else if (args?.byteLength) { - args = { data: args }; // ArrayBuffer - deprecatedArgs = true; - } - if (deprecatedArgs) { - console.error( - "The `PDFViewerApplication.open` signature was updated, please use an object instead." - ); - } - } - if (this.pdfLoadingTask) { // We need to destroy already opened document. await this.close(); diff --git a/web/pdf_find_controller.js b/web/pdf_find_controller.js index 93d860110..afb565e97 100644 --- a/web/pdf_find_controller.js +++ b/web/pdf_find_controller.js @@ -448,18 +448,6 @@ class PDFFindController { if (!state) { return; } - if ( - (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) && - state.phraseSearch === false - ) { - console.error( - "The `phraseSearch`-parameter was removed, please provide " + - "an Array of strings in the `query`-parameter instead." - ); - if (typeof state.query === "string") { - state.query = state.query.match(/\S+/g); - } - } const pdfDocument = this._pdfDocument; const { type } = state; diff --git a/web/pdf_page_view.js b/web/pdf_page_view.js index 9690a5d6d..93c17b833 100644 --- a/web/pdf_page_view.js +++ b/web/pdf_page_view.js @@ -169,13 +169,6 @@ class PDFPageView { if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) { this._isStandalone = !this.renderingQueue?.hasViewer(); this._container = container; - - if (options.useOnlyCssZoom) { - console.error( - "useOnlyCssZoom was removed, please use `maxCanvasPixels = 0` instead." - ); - this.maxCanvasPixels = 0; - } } this._annotationCanvasMap = null; diff --git a/web/pdf_viewer.js b/web/pdf_viewer.js index 69456099a..6038b3b64 100644 --- a/web/pdf_viewer.js +++ b/web/pdf_viewer.js @@ -279,13 +279,6 @@ class PDFViewer { this.enablePrintAutoRotate = options.enablePrintAutoRotate || false; if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) { this.removePageBorders = options.removePageBorders || false; - - if (options.useOnlyCssZoom) { - console.error( - "useOnlyCssZoom was removed, please use `maxCanvasPixels = 0` instead." - ); - options.maxCanvasPixels = 0; - } } this.isOffscreenCanvasSupported = options.isOffscreenCanvasSupported ?? true;