mirror of
https://github.com/mozilla/pdf.js.git
synced 2025-04-20 15:18:08 +02:00
[api-minor] Remove the disableCreateObjectURL
option from the getDocument
parameters, since it's now unused in the API
With the changes in previous patches, the `disableCreateObjectURL` option/functionality is no longer used for anything in the API and/or in the Worker code. Note however that there's some functionality, mainly related to file loading/downloading, in the GENERIC version of the default viewer which still depends on this option. Hence the `disableCreateObjectURL` option (and related compatibility code) is moved into the viewer, see e.g. `web/app_options.js`, such that it's still available in the default viewer.
This commit is contained in:
parent
cc4cc8b11b
commit
18e0b10d3c
11 changed files with 25 additions and 48 deletions
|
@ -2223,7 +2223,7 @@ if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) {
|
|||
}
|
||||
const file = evt.fileInput.files[0];
|
||||
|
||||
if (URL.createObjectURL && !AppOptions.get("disableCreateObjectURL")) {
|
||||
if (!AppOptions.get("disableCreateObjectURL")) {
|
||||
let url = URL.createObjectURL(file);
|
||||
if (file.name) {
|
||||
url = { url, originalUrl: file.name };
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
import { apiCompatibilityParams } from "pdfjs-lib";
|
||||
import { viewerCompatibilityParams } from "./viewer_compatibility.js";
|
||||
|
||||
const OptionKind = {
|
||||
|
@ -43,6 +42,12 @@ const defaultOptions = {
|
|||
value: "",
|
||||
kind: OptionKind.VIEWER + OptionKind.PREFERENCE,
|
||||
},
|
||||
disableCreateObjectURL: {
|
||||
/** @type {boolean} */
|
||||
value: false,
|
||||
compatibility: viewerCompatibilityParams.disableCreateObjectURL,
|
||||
kind: OptionKind.VIEWER,
|
||||
},
|
||||
disableHistory: {
|
||||
/** @type {boolean} */
|
||||
value: false,
|
||||
|
@ -174,12 +179,6 @@ const defaultOptions = {
|
|||
value: false,
|
||||
kind: OptionKind.API + OptionKind.PREFERENCE,
|
||||
},
|
||||
disableCreateObjectURL: {
|
||||
/** @type {boolean} */
|
||||
value: false,
|
||||
compatibility: apiCompatibilityParams.disableCreateObjectURL,
|
||||
kind: OptionKind.API,
|
||||
},
|
||||
disableFontFace: {
|
||||
/** @type {boolean} */
|
||||
value: false,
|
||||
|
|
|
@ -13,11 +13,8 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
import {
|
||||
apiCompatibilityParams,
|
||||
createObjectURL,
|
||||
createValidAbsoluteUrl,
|
||||
} from "pdfjs-lib";
|
||||
import { createObjectURL, createValidAbsoluteUrl } from "pdfjs-lib";
|
||||
import { viewerCompatibilityParams } from "./viewer_compatibility.js";
|
||||
|
||||
if (typeof PDFJSDev !== "undefined" && !PDFJSDev.test("CHROME || GENERIC")) {
|
||||
throw new Error(
|
||||
|
@ -27,7 +24,7 @@ if (typeof PDFJSDev !== "undefined" && !PDFJSDev.test("CHROME || GENERIC")) {
|
|||
}
|
||||
|
||||
const DISABLE_CREATE_OBJECT_URL =
|
||||
apiCompatibilityParams.disableCreateObjectURL || false;
|
||||
viewerCompatibilityParams.disableCreateObjectURL || false;
|
||||
|
||||
function download(blobUrl, filename) {
|
||||
const a = document.createElement("a");
|
||||
|
|
|
@ -74,14 +74,10 @@ class PDFAttachmentViewer {
|
|||
}
|
||||
|
||||
/**
|
||||
* NOTE: Should only be used when `URL.createObjectURL` is natively supported.
|
||||
* @private
|
||||
*/
|
||||
_bindPdfLink(button, content, filename) {
|
||||
if (this.downloadManager.disableCreateObjectURL) {
|
||||
throw new Error(
|
||||
'bindPdfLink: Unsupported "disableCreateObjectURL" value.'
|
||||
);
|
||||
}
|
||||
let blobUrl;
|
||||
button.onclick = () => {
|
||||
if (!blobUrl) {
|
||||
|
|
|
@ -65,8 +65,7 @@ function PDFPrintService(pdfDocument, pagesOverview, printContainer, l10n) {
|
|||
this.pagesOverview = pagesOverview;
|
||||
this.printContainer = printContainer;
|
||||
this.l10n = l10n || NullL10n;
|
||||
this.disableCreateObjectURL =
|
||||
pdfDocument.loadingParams.disableCreateObjectURL;
|
||||
this.disableCreateObjectURL = AppOptions.get("disableCreateObjectURL");
|
||||
this.currentPage = -1;
|
||||
// The temporary canvas where renderPage paints one page at a time.
|
||||
this.scratchCanvas = document.createElement("canvas");
|
||||
|
|
|
@ -23,9 +23,21 @@ if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) {
|
|||
(typeof navigator !== "undefined" && navigator.maxTouchPoints) || 1;
|
||||
|
||||
const isAndroid = /Android/.test(userAgent);
|
||||
const isIE = /Trident/.test(userAgent);
|
||||
const isIOS =
|
||||
/\b(iPad|iPhone|iPod)(?=;)/.test(userAgent) ||
|
||||
(platform === "MacIntel" && maxTouchPoints > 1);
|
||||
const isIOSChrome = /CriOS/.test(userAgent);
|
||||
|
||||
// Checks if possible to use URL.createObjectURL()
|
||||
// Support: IE, Chrome on iOS
|
||||
(function checkOnBlobSupport() {
|
||||
// Sometimes IE and Chrome on iOS losing the data created with
|
||||
// createObjectURL(), see issues #3977 and #8081.
|
||||
if (isIE || isIOSChrome) {
|
||||
compatibilityParams.disableCreateObjectURL = true;
|
||||
}
|
||||
})();
|
||||
|
||||
// Limit canvas size to 5 mega-pixels on mobile.
|
||||
// Support: Android, iOS
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue