Skip to content

Commit 5613893

Browse files
committed
netteForms: removed eval() and Nette.parseJSON [Closes #184]
1 parent ecca771 commit 5613893

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

src/assets/netteForms.js

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
*/
148148
Nette.validateControl = function(elem, rules, onlyCheck, value, emptyOptional) {
149149
elem = elem.tagName ? elem : elem[0]; // RadioNodeList
150-
rules = rules || Nette.parseJSON(elem.getAttribute('data-nette-rules'));
150+
rules = rules || JSON.parse(elem.getAttribute('data-nette-rules') || '[]');
151151
value = value === undefined ? {value: Nette.getEffectiveValue(elem)} : value;
152152

153153
for (var id = 0, len = rules.length; id < len; id++) {
@@ -217,7 +217,7 @@
217217
Nette.formErrors = [];
218218

219219
if (form['nette-submittedBy'] && form['nette-submittedBy'].getAttribute('formnovalidate') !== null) {
220-
var scopeArr = Nette.parseJSON(form['nette-submittedBy'].getAttribute('data-nette-validation-scope'));
220+
var scopeArr = JSON.parse(form['nette-submittedBy'].getAttribute('data-nette-validation-scope') || '[]');
221221
if (scopeArr.length) {
222222
scope = new RegExp('^(' + scopeArr.join('-|') + '-)');
223223
} else {
@@ -585,7 +585,7 @@
585585
* Process toggles on form element.
586586
*/
587587
Nette.toggleControl = function(elem, rules, success, firsttime, value) {
588-
rules = rules || Nette.parseJSON(elem.getAttribute('data-nette-rules'));
588+
rules = rules || JSON.parse(elem.getAttribute('data-nette-rules') || '[]');
589589
value = value === undefined ? {value: Nette.getEffectiveValue(elem)} : value;
590590

591591
var has = false,
@@ -645,13 +645,6 @@
645645
};
646646

647647

648-
Nette.parseJSON = function(s) {
649-
return (s || '').substr(0, 3) === '{op'
650-
? eval('[' + s + ']') // backward compatibility with Nette 2.0.x
651-
: JSON.parse(s || '[]');
652-
};
653-
654-
655648
/**
656649
* Displays or hides HTML element.
657650
*/

0 commit comments

Comments
 (0)