Skip to content

Commit 17f4d1e

Browse files
committed
netteForms: refactoring
1 parent 1838ae5 commit 17f4d1e

File tree

1 file changed

+9
-13
lines changed

1 file changed

+9
-13
lines changed

src/assets/netteForms.js

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@
138138
* Validates form element against given rules.
139139
*/
140140
Nette.validateControl = function(elem, rules, onlyCheck, value, emptyOptional) {
141-
var top = !rules;
142141
elem = elem.tagName ? elem : elem[0]; // RadioNodeList
143142
rules = rules || JSON.parse(elem.getAttribute('data-nette-rules') || '[]');
144143
value = value === undefined ? {value: Nette.getEffectiveValue(elem)} : value;
@@ -328,9 +327,8 @@
328327

329328
dialog.setAttribute('class', 'netteFormsModal');
330329
dialog.innerText = message + '\n\n';
331-
dialog.appendChild(style);
332-
dialog.appendChild(button);
333-
document.body.appendChild(dialog);
330+
dialog.append(style, button);
331+
document.body.append(dialog);
334332
dialog.showModal();
335333
};
336334

@@ -369,7 +367,7 @@
369367
filled: function(elem, arg, val) {
370368
return val !== '' && val !== false && val !== null
371369
&& (!Array.isArray(val) || !!val.length)
372-
&& (!window.FileList || !(val instanceof window.FileList) || val.length);
370+
&& (!(val instanceof FileList) || val.length);
373371
},
374372

375373
blank: function(elem, arg, val) {
@@ -458,7 +456,7 @@
458456
regExp = new RegExp('^(?:' + arg + ')$', caseInsensitive ? 'i' : '');
459457
}
460458

461-
if (window.FileList && val instanceof FileList) {
459+
if (val instanceof FileList) {
462460
for (var i = 0; i < val.length; i++) {
463461
if (!regExp.test(val[i].name)) {
464462
return false;
@@ -511,11 +509,9 @@
511509
},
512510

513511
fileSize: function(elem, arg, val) {
514-
if (window.FileList) {
515-
for (var i = 0; i < val.length; i++) {
516-
if (val[i].size > arg) {
517-
return false;
518-
}
512+
for (var i = 0; i < val.length; i++) {
513+
if (val[i].size > arg) {
514+
return false;
519515
}
520516
}
521517
return true;
@@ -528,7 +524,7 @@
528524
}
529525
re = new RegExp(re.join('|'));
530526

531-
if (window.FileList && val instanceof FileList) {
527+
if (val instanceof FileList) {
532528
for (i = 0; i < val.length; i++) {
533529
if (val[i].type && !re.test(val[i].type)) {
534530
return false;
@@ -682,7 +678,7 @@
682678
elem = document.createElement('input');
683679
elem.setAttribute('name', name);
684680
elem.setAttribute('type', 'hidden');
685-
form.appendChild(elem);
681+
form.append(elem);
686682
}
687683
form.elements[name].value = values[name].join(',');
688684
form.elements[name].disabled = values[name].length === 0;

0 commit comments

Comments
 (0)