From 0f90d5130c9b4c847d5efecac9a727c151156883 Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Sun, 15 Oct 2017 13:27:10 +0200 Subject: [PATCH] [api-major] Remove all remaining `deprecated` functions/methods --- src/display/dom_utils.js | 10 +-------- src/display/global.js | 44 +++++----------------------------------- src/display/metadata.js | 7 +------ src/pdf.js | 1 - 4 files changed, 7 insertions(+), 55 deletions(-) diff --git a/src/display/dom_utils.js b/src/display/dom_utils.js index 592765564..3dd1b2a32 100644 --- a/src/display/dom_utils.js +++ b/src/display/dom_utils.js @@ -14,8 +14,7 @@ */ import { - assert, CMapCompressionType, createValidAbsoluteUrl, deprecated, - removeNullCharacters, stringToBytes, warn + assert, CMapCompressionType, removeNullCharacters, stringToBytes, warn } from '../shared/util'; import globalScope from '../shared/global_scope'; @@ -464,18 +463,11 @@ function isExternalLinkTargetSet() { } } -function isValidUrl(url, allowRelative) { - deprecated('isValidUrl(), please use createValidAbsoluteUrl() instead.'); - var baseUrl = allowRelative ? 'http://example.com' : null; - return createValidAbsoluteUrl(url, baseUrl) !== null; -} - export { CustomStyle, RenderingCancelledException, addLinkAttributes, isExternalLinkTargetSet, - isValidUrl, getFilenameFromUrl, LinkTarget, getDefaultSetting, diff --git a/src/display/global.js b/src/display/global.js index 1367fce3f..46252b11a 100644 --- a/src/display/global.js +++ b/src/display/global.js @@ -18,11 +18,11 @@ import { isExternalLinkTargetSet, isValidUrl, LinkTarget } from './dom_utils'; import { - createBlob, createObjectURL, createPromiseCapability, deprecated, - getVerbosityLevel, InvalidPDFException, isLittleEndian, - MissingPDFException, OPS, PageViewport, PasswordException, PasswordResponses, - removeNullCharacters, setVerbosityLevel, shadow, UnexpectedResponseException, - UnknownErrorException, UNSUPPORTED_FEATURES, Util, VERBOSITY_LEVELS, warn + createBlob, createObjectURL, createPromiseCapability, getVerbosityLevel, + InvalidPDFException, isLittleEndian, MissingPDFException, OPS, PageViewport, + PasswordException, PasswordResponses, removeNullCharacters, setVerbosityLevel, + shadow, UnexpectedResponseException, UnknownErrorException, + UNSUPPORTED_FEATURES, Util, VERBOSITY_LEVELS } from '../shared/util'; import { getDocument, LoopbackPort, PDFDataRangeTransport, PDFWorker @@ -247,40 +247,6 @@ PDFJS.isEvalSupported = (PDFJS.isEvalSupported === undefined ? */ PDFJS.pdfjsNext = (PDFJS.pdfjsNext === undefined) ? false : PDFJS.pdfjsNext; -if (typeof PDFJSDev === 'undefined' || !PDFJSDev.test('MOZCENTRAL')) { - var savedOpenExternalLinksInNewWindow = PDFJS.openExternalLinksInNewWindow; - delete PDFJS.openExternalLinksInNewWindow; - Object.defineProperty(PDFJS, 'openExternalLinksInNewWindow', { - get() { - return PDFJS.externalLinkTarget === LinkTarget.BLANK; - }, - set(value) { - if (value) { - deprecated('PDFJS.openExternalLinksInNewWindow, please use ' + - '"PDFJS.externalLinkTarget = PDFJS.LinkTarget.BLANK" instead.'); - } - if (PDFJS.externalLinkTarget !== LinkTarget.NONE) { - warn('PDFJS.externalLinkTarget is already initialized'); - return; - } - PDFJS.externalLinkTarget = value ? LinkTarget.BLANK : LinkTarget.NONE; - }, - enumerable: true, - configurable: true, - }); - if (savedOpenExternalLinksInNewWindow) { - /** - * (Deprecated) Opens external links in a new window if enabled. - * The default behavior opens external links in the PDF.js window. - * - * NOTE: This property has been deprecated, please use - * `PDFJS.externalLinkTarget = PDFJS.LinkTarget.BLANK` instead. - * @var {boolean} - */ - PDFJS.openExternalLinksInNewWindow = savedOpenExternalLinksInNewWindow; - } -} - PDFJS.getDocument = getDocument; PDFJS.LoopbackPort = LoopbackPort; PDFJS.PDFDataRangeTransport = PDFDataRangeTransport; diff --git a/src/display/metadata.js b/src/display/metadata.js index 7878ec838..3ef5c7d67 100644 --- a/src/display/metadata.js +++ b/src/display/metadata.js @@ -13,7 +13,7 @@ * limitations under the License. */ -import { assert, deprecated } from '../shared/util'; +import { assert } from '../shared/util'; import { SimpleXMLParser } from './dom_utils'; class Metadata { @@ -98,11 +98,6 @@ class Metadata { has(name) { return typeof this._metadata[name] !== 'undefined'; } - - get metadata() { - deprecated('`metadata` getter; use `getAll()` instead.'); - return this.getAll(); - } } export { diff --git a/src/pdf.js b/src/pdf.js index e61964152..57ab13faf 100644 --- a/src/pdf.js +++ b/src/pdf.js @@ -64,7 +64,6 @@ exports.UnexpectedResponseException = pdfjsSharedUtil.UnexpectedResponseException; exports.OPS = pdfjsSharedUtil.OPS; exports.UNSUPPORTED_FEATURES = pdfjsSharedUtil.UNSUPPORTED_FEATURES; -exports.isValidUrl = pdfjsDisplayDOMUtils.isValidUrl; exports.createValidAbsoluteUrl = pdfjsSharedUtil.createValidAbsoluteUrl; exports.createObjectURL = pdfjsSharedUtil.createObjectURL; exports.removeNullCharacters = pdfjsSharedUtil.removeNullCharacters;