Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17328 from Snuffleupagus/fetchData-blob

Browse Source 
Use the `fetchData` helper function in more cases
This commit is contained in:
Jonas Jenwald 2023-11-25 08:31:12 +01:00 committed by GitHub
commit 3d9f68cb97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/display/display_utils.js
View File

@ -399,6 +399,8 @@ async function fetchData(url, type = "text") {
switch (type) { switch (type) {
case "arraybuffer": case "arraybuffer":
return response.arrayBuffer(); return response.arrayBuffer();
case "blob":
return response.blob();
case "json": case "json":
return response.json(); return response.json();
} }
@ -419,6 +421,7 @@ async function fetchData(url, type = "text") {
let data; let data;
switch (type) { switch (type) {
case "arraybuffer": case "arraybuffer":
case "blob":
case "json": case "json":
data = request.response; data = request.response;
break; break;

14
src/display/editor/tools.js
View File

@ -27,7 +27,12 @@ import {
Util, Util,
warn, warn,
} from "../../shared/util.js"; } from "../../shared/util.js";
import { getColorValues, getRGB, PixelsPerInch } from "../display_utils.js"; import {
fetchData,
getColorValues,
getRGB,
PixelsPerInch,
} from "../display_utils.js";
function bindEvents(obj, element, names) { function bindEvents(obj, element, names) {
for (const name of names) { for (const name of names) {
@ -116,12 +121,7 @@ class ImageManager {
let image; let image;
if (typeof rawData === "string") { if (typeof rawData === "string") {
data.url = rawData; data.url = rawData;
image = await fetchData(rawData, "blob");
const response = await fetch(rawData);
if (!response.ok) {
throw new Error(response.statusText);
}
image = await response.blob();
} else { } else {
image = data.file = rawData; image = data.file = rawData;
} }

18
web/l10n_utils.js
View File

@ -15,10 +15,10 @@
/** @typedef {import("./interfaces").IL10n} IL10n */ /** @typedef {import("./interfaces").IL10n} IL10n */
import { fetchData, shadow } from "pdfjs-lib";
import { FluentBundle, FluentResource } from "fluent-bundle"; import { FluentBundle, FluentResource } from "fluent-bundle";
import { DOMLocalization } from "fluent-dom"; import { DOMLocalization } from "fluent-dom";
import { L10n } from "./l10n.js"; import { L10n } from "./l10n.js";
import { shadow } from "pdfjs-lib";
/** /**
* @implements {IL10n} * @implements {IL10n}
@ -32,14 +32,14 @@ class ConstL10n extends L10n {
} }
static async *#generateBundles(lang) { static async *#generateBundles(lang) {
let text; const text =
if (typeof PDFJSDev === "undefined") { typeof PDFJSDev === "undefined"
const url = new URL(`./locale/${lang}/viewer.ftl`, window.location.href); ? await fetchData(
const data = await fetch(url); new URL(`./locale/${lang}/viewer.ftl`, window.location.href),
text = await data.text(); /* type = */ "text"
} else { )
text = PDFJSDev.eval("DEFAULT_FTL"); : PDFJSDev.eval("DEFAULT_FTL");
}
const resource = new FluentResource(text); const resource = new FluentResource(text);
const bundle = new FluentBundle(lang); const bundle = new FluentBundle(lang);
const errors = bundle.addResource(resource); const errors = bundle.addResource(resource);