ZenBrowserMirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/zen-browser/pdf.js.git synced 2025-07-09 09:45:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

For text widgets, get the text from the AP stream instead of from the format callback (bug 1825002)

Browse source 
When fixing bug 1766987, I thought the field formatted value came from
the result of the format callback: I was wrong. The format callback is ran
but the value is unused (maybe it's useful to set some global vars... or
it's just a bug in Acrobat). Anyway the value to display is the one rendered
in the AP stream.
The field value setter has been simplified and that fixes issue #16409.
This commit is contained in:
Calixte Denizet 2023-05-16 23:03:01 +02:00
parent 5ae353cf4d
commit 177036e6ae
7 changed files with 93 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/scripting_api/event.js
View file

@ -98,8 +98,9 @@ class EventDispatcher {
// errors in the case where a formatter is using one of those named
// actions (see #15818).
this._document.obj._initActions();
// Before running the Open event, we format all the fields
// (see bug 1766987).
// Before running the Open event, we run the format callbacks but
// without changing the value of the fields.
// Acrobat does the same thing.
this.formatAll();
}
if (
@ -232,13 +233,7 @@ class EventDispatcher {
const event = (globalThis.event = new Event({}));
for (const source of Object.values(this._objects)) {
event.value = source.obj.value;
if (this.runActions(source, source, event, "Format")) {
source.obj._send({
id: source.obj._id,
siblings: source.obj._siblings,
formattedValue: event.value?.toString?.(),
});
}
this.runActions(source, source, event, "Format");
}
}

30
src/scripting_api/field.js
View file

@ -13,7 +13,7 @@
* limitations under the License.
*/
import { createActionsMap, FieldType, getFieldType } from "./common.js";
import { createActionsMap, getFieldType } from "./common.js";
import { Color } from "./color.js";
import { PDFObject } from "./pdf_object.js";
@ -247,29 +247,15 @@ class Field extends PDFObject {
return;
}
if (value === "") {
this._value = "";
} else if (typeof value === "string") {
switch (this._fieldType) {
case FieldType.none: {
this._originalValue = value;
const _value = value.trim().replace(",", ".");
this._value = !isNaN(_value) ? parseFloat(_value) : value;
break;
}
case FieldType.number:
case FieldType.percent: {
const _value = value.trim().replace(",", ".");
const number = parseFloat(_value);
this._value = !isNaN(number) ? number : 0;
break;
}
default:
this._value = value;
}
} else {
if (value === "" || typeof value !== "string") {
this._originalValue = undefined;
this._value = value;
return;
}
this._originalValue = value;
const _value = value.trim().replace(",", ".");
this._value = !isNaN(_value) ? parseFloat(_value) : value;
}
_getValue() {