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

Improve date parsing in the js sandbox

Browse source 
If for example dd:mm is failing we just try with d:m which is equivalent
to the regex /d{1,2}:m{1,2}/. This way it allows the user to forget the
0 for the first days/months.
This commit is contained in:
Calixte Denizet 2024-06-11 21:49:29 +02:00
parent e3caa3c6ee
commit c14c3cfc9f
2 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/scripting_api/aform.js
View file

@ -140,11 +140,26 @@ class AForm {
return date; return date;
} }
_parseDate(cFormat, cDate) { _parseDate(cFormat, cDate, strict = false) {
let date = null; let date = null;
try { try {
date = this._util.scand(cFormat, cDate); date = this._util.scand(cFormat, cDate);
} catch {} } catch {}
if (!date) {
if (strict) {
return null;
}
let format = cFormat;
if (/mm(?!m)/.test(format)) {
format = format.replace("mm", "m");
}
if (/dd(?!d)/.test(format)) {
format = format.replace("dd", "d");
}
try {
date = this._util.scand(format, cDate);
} catch {}
}
if (!date) { if (!date) {
date = Date.parse(cDate); date = Date.parse(cDate);
date = isNaN(date) date = isNaN(date)
@ -379,7 +394,7 @@ class AForm {
return; return;
} }
if (this._parseDate(cFormat, value) === null) { if (this._parseDate(cFormat, value, /* strict = */ true) === null) {
const invalid = GlobalConstants.IDS_INVALID_DATE; const invalid = GlobalConstants.IDS_INVALID_DATE;
const invalid2 = GlobalConstants.IDS_INVALID_DATE2; const invalid2 = GlobalConstants.IDS_INVALID_DATE2;
const err = `${invalid} ${this._mkTargetName( const err = `${invalid} ${this._mkTargetName(

4
test/unit/scripting_spec.js
View file

@ -628,6 +628,10 @@ describe("Scripting", function () {
await check("12", "mm", "2000/12/01"); await check("12", "mm", "2000/12/01");
await check("2022", "yyyy", "2022/01/01"); await check("2022", "yyyy", "2022/01/01");
await check("a1$9bbbb21", "dd/mm/yyyy", "2021/09/01"); await check("a1$9bbbb21", "dd/mm/yyyy", "2021/09/01");
await check("1/2/2024", "dd/mm/yyyy", "2024/02/01");
await check("01/2/2024", "dd/mm/yyyy", "2024/02/01");
await check("1/02/2024", "dd/mm/yyyy", "2024/02/01");
await check("01/02/2024", "dd/mm/yyyy", "2024/02/01");
// The following test isn't working as expected because // The following test isn't working as expected because
// the quickjs date parser has been replaced by the browser one // the quickjs date parser has been replaced by the browser one