1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-19 14:48:08 +02:00

Merge pull request #19508 from calixteman/issue19505

[JS] Skip throwing actions
This commit is contained in:
calixteman 2025-02-17 22:57:14 +01:00 committed by GitHub
commit 203452c170
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 49 additions and 23 deletions

View file

@ -175,9 +175,16 @@ class Doc extends PDFObject {
_runActions(name) {
const actions = this._actions.get(name);
if (actions) {
for (const action of actions) {
if (!actions) {
return;
}
for (const action of actions) {
try {
this._globalEval(action);
} catch (error) {
const serializedError = serializeError(error);
serializedError.value = `Error when executing "${name}" for document\n${serializedError.value}`;
this._send(serializedError);
}
}
}

View file

@ -14,7 +14,6 @@
*/
import {
serializeError,
USERACTIVATION_CALLBACKID,
USERACTIVATION_MAXTIME_VALIDITY,
} from "./app_utils.js";
@ -311,12 +310,7 @@ class EventDispatcher {
const source = this._objects[first];
globalThis.event = new Event({});
try {
this.runCalculate(source, globalThis.event);
} catch (error) {
this._isCalculating = false;
throw error;
}
this.runCalculate(source, globalThis.event);
this._isCalculating = false;
}
@ -345,15 +339,8 @@ class EventDispatcher {
event.value = null;
const target = this._objects[targetId];
let savedValue = target.obj._getValue();
try {
this.runActions(source, target, event, "Calculate");
} catch (error) {
const fieldId = target.obj._id;
const serializedError = serializeError(error);
serializedError.value = `Error when calculating value for field "${fieldId}"\n${serializedError.value}`;
this._externalCall("send", [serializedError]);
continue;
}
this.runActions(source, target, event, "Calculate");
if (!event.rc) {
continue;
}

View file

@ -16,6 +16,7 @@
import { createActionsMap, FieldType, getFieldType } from "./common.js";
import { Color } from "./color.js";
import { PDFObject } from "./pdf_object.js";
import { serializeError } from "./app_utils.js";
class Field extends PDFObject {
constructor(data) {
@ -552,14 +553,15 @@ class Field extends PDFObject {
}
const actions = this._actions.get(eventName);
try {
for (const action of actions) {
for (const action of actions) {
try {
// Action evaluation must happen in the global scope
this._globalEval(action);
} catch (error) {
const serializedError = serializeError(error);
serializedError.value = `Error when executing "${eventName}" for field "${this._id}"\n${serializedError.value}`;
this._send(serializedError);
}
} catch (error) {
event.rc = false;
throw error;
}
return true;

View file

@ -2528,4 +2528,33 @@ describe("Interaction", () => {
);
});
});
describe("Skip throwing actions (issue 19505)", () => {
let pages;
beforeAll(async () => {
pages = await loadAndWait("issue19505.pdf", "[data-annotation-id='24R']");
});
afterAll(async () => {
await closePages(pages);
});
it("must check that date entered are in the input", async () => {
await Promise.all(
pages.map(async ([browserName, page]) => {
await waitForScripting(page);
const fieldSelector = getSelector("24R");
for (const c of "Hello World") {
await page.type(fieldSelector, c);
await waitForSandboxTrip(page);
}
const value = await page.$eval(fieldSelector, el => el.value);
expect(value).withContext(`In ${browserName}`).toEqual("Hello World");
})
);
});
});
});

View file

@ -704,3 +704,4 @@
!issue19360.pdf
!bug1019475_1.pdf
!bug1019475_2.pdf
!issue19505.pdf

BIN
test/pdfs/issue19505.pdf Executable file

Binary file not shown.