1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-22 16:18:08 +02:00

Merge pull request #14073 from calixteman/bindItems

XFA - Bind items when there's a bindItems entry
This commit is contained in:
calixteman 2021-09-24 09:01:52 -07:00 committed by GitHub
commit 104e049338
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 63 additions and 10 deletions

View file

@ -478,6 +478,12 @@ class Binder {
return [occur.min, max];
}
_setAndBind(formNode, dataNode) {
this._setProperties(formNode, dataNode);
this._bindItems(formNode, dataNode);
this._bindElement(formNode, dataNode);
}
_bindElement(formNode, dataNode) {
// Some nodes can be useless because min=0 so remove them
// after the loop to avoid bad things.
@ -530,7 +536,7 @@ class Binder {
if (child.bind) {
switch (child.bind.match) {
case "none":
this._bindElement(child, dataNode);
this._setAndBind(child, dataNode);
continue;
case "global":
global = true;
@ -538,7 +544,7 @@ class Binder {
case "dataRef":
if (!child.bind.ref) {
warn(`XFA - ref is empty in node ${child[$nodeName]}.`);
this._bindElement(child, dataNode);
this._setAndBind(child, dataNode);
continue;
}
ref = child.bind.ref;
@ -578,7 +584,7 @@ class Binder {
}
// Don't bind the value in newly created node because it's empty.
this._bindElement(child, match);
this._setAndBind(child, match);
continue;
} else {
if (this._isConsumeData()) {
@ -598,7 +604,7 @@ class Binder {
}
} else {
if (!child.name) {
this._bindElement(child, dataNode);
this._setAndBind(child, dataNode);
continue;
}
if (this._isConsumeData()) {
@ -642,9 +648,7 @@ class Binder {
dataNode[$appendChild](match);
// Don't bind the value in newly created node because it's empty.
this._setProperties(child, match);
this._bindItems(child, match);
this._bindElement(child, match);
this._setAndBind(child, match);
continue;
}
if (this.emptyMerge) {
@ -657,9 +661,7 @@ class Binder {
if (match) {
this._bindOccurrences(child, match, picture);
} else if (min > 0) {
this._setProperties(child, dataNode);
this._bindItems(child, dataNode);
this._bindElement(child, dataNode);
this._setAndBind(child, dataNode);
} else {
uselessNodes.push(child);
}