netteForms: added formValues (list of computed values) instead of 'preventFiltering' workaround [Closes #161][Closes #143]

should be better solution than 94c47d5

Author: dg

src/assets/netteForms.js

@@ -29,6 +29,7 @@
 	'use strict';
 
 	var Nette = {};
+	var formValues = {};
 	var formToggles = {};
 
 	Nette.formErrors = [];
@@ -114,6 +115,9 @@
 	 * Returns the effective value of form element.
 	 */
 	Nette.getEffectiveValue = function(elem, filter) {
+		if (formValues[elem.name] !== undefined) {
+			return formValues[elem.name];
+		}
 		var val = Nette.getValue(elem);
 		if (elem.getAttribute) {
 			if (val === elem.getAttribute('data-nette-empty-value')) {
@@ -125,7 +129,7 @@
 			Nette.validateControl(elem, null, true, ref);
 			val = ref.value;
 		}
-		return val;
+		return formValues[elem.name] = val;
 	};
 
 
@@ -200,6 +204,7 @@
 			scope = false;
 
 		Nette.formErrors = [];
+		formValues = {};
 
 		if (form['nette-submittedBy'] && form['nette-submittedBy'].getAttribute('formnovalidate') !== null) {
 			var scopeArr = JSON.parse(form['nette-submittedBy'].getAttribute('data-nette-validation-scope') || '[]');
@@ -297,8 +302,6 @@
 	};
 
 
-	var preventFiltering = false;
-
 	/**
 	 * Validates single rule.
 	 */
@@ -312,16 +315,13 @@
 		op = op.replace(/\\/g, '');
 
 		var arr = Array.isArray(arg) ? arg.slice(0) : [arg];
-		if (!preventFiltering) {
-			preventFiltering = true;
-			for (var i = 0, len = arr.length; i < len; i++) {
-				if (arr[i] && arr[i].control) {
-					var control = elem.form.elements.namedItem(arr[i].control);
-					arr[i] = control === elem ? value.value : Nette.getEffectiveValue(control, true);
-				}
+		for (var i = 0, len = arr.length; i < len; i++) {
+			if (arr[i] && arr[i].control) {
+				var control = elem.form.elements.namedItem(arr[i].control);
+				arr[i] = control === elem ? value.value : Nette.getEffectiveValue(control, true);
 			}
-			preventFiltering = false;
 		}
+
 		return Nette.validators[op]
 			? Nette.validators[op](elem, Array.isArray(arg) ? arr : arr[0], value.value, value)
 			: null;
@@ -561,7 +561,7 @@
 	 */
 	Nette.toggleForm = function(form, elem) {
 		var i;
-		formToggles = {};
+		formToggles = formValues = {};
 		for (i = 0; i < form.elements.length; i++) {
 			if (form.elements[i].tagName.toLowerCase() in {input: 1, select: 1, textarea: 1, button: 1}) {
 				Nette.toggleControl(form.elements[i], null, null, !elem);
@@ -669,6 +669,12 @@
 				e.preventDefault();
 			}
 		});
+
+		for (var i = 0; i < form.elements.length; i++) {
+			form.elements[i].addEventListener('change', function(e) {
+				formValues = {};
+			});
+		}
 	};