Jingga/jsOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/jsOMS.git synced 2026-01-11 09:58:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

allow iframe content as form data and data collection change

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-10-29 22:28:22 +01:00
parent eb722e5e17
commit c3ef47b718
2 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
UI/GeneralUI.js
View File

@ -98,9 +98,13 @@ export class GeneralUI
const length = e.length;
for (let i = 0; i < length; ++i) {
e[i].addEventListener('load', function() {
this.height = this.contentWindow.document.body.scrollHeight + 25;
});
if (e[i].contentWindow.document.readyState === 'complete') {
e[i].height = e[i].contentWindow.document.body.scrollHeight + 25;
} else {
e[i].addEventListener('load', function() {
this.height = this.contentWindow.document.body.scrollHeight + 25;
});
}
}
}

28
Views/FormView.js
View File

@ -306,7 +306,7 @@ export class FormView
canvas = form.getElementsByTagName('canvas'),
external = [].slice.call(document.querySelectorAll(':not(#' + this.id + ') [form=' + this.id + ']')),
special = form.querySelectorAll('[data-name]'),
specialExt = document.querySelectorAll('[data-form=' + this.id + '] [data-name]'),
specialExt = document.querySelectorAll(':not(#' + this.id + ') [data-form=' + this.id + ']'),
inputLength = inputs.length,
externalLength = external.length,
specialLength = specialExt.length;
@ -408,6 +408,32 @@ export class FormView
for (let j = 0; j < filesLength; ++j) {
formData.append(id + j, elements[i].files[j]);
}
} else if (elements[i].tagName.toLowerCase() === 'iframe') {
const iframeElements = Array.prototype.slice.call(
elements[i].contentWindow.document.querySelectorAll('[form=' + this.id + ']')
).concat(
Array.prototype.slice.call(
elements[i].contentWindow.document.querySelectorAll('[data-form=' + this.id + '] [data-name]')
)
).filter(function(val) { return val; });
const iframeLength = iframeElements.length;
for (let j = 0; j < iframeLength; ++j) {
value = iframeElements[j].value;
const iframeId = FormView.getElementId(iframeElements[j]);
if (data.hasOwnProperty(iframeId)) {
if (data[iframeId].constructor !== Array) {
data[iframeId] = [data[iframeId]];
}
data[iframeId].push(value);
} else {
data[iframeId] = value;
}
}
continue;
} else {
if (typeof elements[i].value !== 'undefined') {
value = elements[i].value;