1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-19 22:58:07 +02:00

[JS] Let AFSpecial_KeystrokeEx match a format without 'decoration' (bug 1916714)

It'll let the user enter 1234567 instead of 123-4567 for example.
It works like this in other pdf viewers.
This commit is contained in:
Calixte Denizet 2024-09-09 18:53:16 +02:00
parent a1b45d6e69
commit bae32b4fd2
2 changed files with 151 additions and 5 deletions

View file

@ -560,6 +560,22 @@ class AForm {
}
AFSpecial_KeystrokeEx(cMask) {
const event = globalThis.event;
// Simplify the format string by removing all characters that are not
// specific to the format because the user could enter 1234567 when the
// format is 999-9999.
const simplifiedFormatStr = cMask.replaceAll(/[^9AOX]/g, "");
this.#AFSpecial_KeystrokeEx_helper(simplifiedFormatStr, false);
if (event.rc) {
return;
}
event.rc = true;
this.#AFSpecial_KeystrokeEx_helper(cMask, true);
}
#AFSpecial_KeystrokeEx_helper(cMask, warn) {
if (!cMask) {
return;
}
@ -605,20 +621,26 @@ class AForm {
const err = `${GlobalConstants.IDS_INVALID_VALUE} = "${cMask}"`;
if (value.length > cMask.length) {
this._app.alert(err);
if (warn) {
this._app.alert(err);
}
event.rc = false;
return;
}
if (event.willCommit) {
if (value.length < cMask.length) {
this._app.alert(err);
if (warn) {
this._app.alert(err);
}
event.rc = false;
return;
}
if (!_checkValidity(value, cMask)) {
this._app.alert(err);
if (warn) {
this._app.alert(err);
}
event.rc = false;
return;
}
@ -631,7 +653,9 @@ class AForm {
}
if (!_checkValidity(value, cMask)) {
this._app.alert(err);
if (warn) {
this._app.alert(err);
}
event.rc = false;
}
}
@ -651,7 +675,7 @@ class AForm {
case 2:
const value = this.AFMergeChange(event);
formatStr =
value.length > 8 || value.startsWith("(")
value.startsWith("(") || (value.length > 7 && /^\p{N}+$/.test(value))
? "(999) 999-9999"
: "999-9999";
break;