netteForms.js: fixed length validation on checkbox list with exactly …

…1 item [Closes #59]
nette · Feb 8, 2015 · 22d3d82 · 22d3d82
1 parent 4917e9c
commit 22d3d82
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/assets/netteForms.js b/src/assets/netteForms.js
@@ -61,11 +61,8 @@ Nette.getValue = function(elem) {
 		}
 		return values;
 
-	} else if (elem.type === 'checkbox') {
-		return elem.checked;
-
-	} else if (elem.type === 'radio') {
-		return elem.checked && elem.value;
+	} else if (elem.type === 'checkbox' || elem.type === 'radio') {
+		return Nette.getValue([elem]);
 
 	} else if (elem.type === 'file') {
 		return elem.files || elem.value;
@@ -259,7 +256,11 @@ Nette.validators = {
 	equal: function(elem, arg, val) {
 		if (arg === undefined) {
 			return null;
+
+		} else if (elem.type === 'checkbox' && arg === true && val) {
+			return true;
 		}
+
 		val = Nette.isArray(val) ? val : [val];
 		arg = Nette.isArray(arg) ? arg : [arg];
 		loop:

diff --git a/tests/netteForms.js/spec/Nette.validateRuleSpec.js b/tests/netteForms.js/spec/Nette.validateRuleSpec.js
@@ -112,13 +112,13 @@ describe('Nette.getValue & validateRule', function() {
 			form = doc.forms[0],
 			el = form.input;
 
-		expect(Nette.getValue(el)).toBe(false);
+		expect(Nette.getValue(el)).toBe(null);
 		expect(Nette.validateRule(el, 'filled')).toBe(false);
 		expect(Nette.validateRule(el, 'blank')).toBe(true);
 		expect(Nette.validateRule(el, 'equal', false)).toBe(true);
 
 		el.checked = true;
-		expect(Nette.getValue(el)).toBe(true);
+		expect(Nette.getValue(el)).toBe('r');
 		expect(Nette.validateRule(el, 'filled')).toBe(true);
 		expect(Nette.validateRule(el, 'blank')).toBe(false);
 		expect(Nette.validateRule(el, 'equal', true)).toBe(true);
@@ -165,7 +165,7 @@ describe('Nette.getValue & validateRule', function() {
 			form = doc.forms[0],
 			el = form.input;
 
-		expect(Nette.getValue(el)).toBe(false);
+		expect(Nette.getValue(el)).toBe(null);
 		expect(Nette.validateRule(el, 'filled')).toBe(false);
 		expect(Nette.validateRule(el, 'blank')).toBe(true);
 		expect(Nette.validateRule(el, 'equal', ['f', 'm'])).toBe(false);