netteForms.js: validator 'equal' compares values as PHP strings

Author: dg

src/assets/netteForms.js

@@ -294,13 +294,21 @@ Nette.validators = {
 		if (arg === undefined) {
 			return null;
 		}
+
+		function toString(val) {
+			if (typeof val === 'number' || typeof val === 'string') {
+				return '' + val;
+			} else {
+				return val === true ? '1' : '';
+			}
+		}
+
 		val = Nette.isArray(val) ? val : [val];
 		arg = Nette.isArray(arg) ? arg : [arg];
 		loop:
 		for (var i1 = 0, len1 = val.length; i1 < len1; i1++) {
 			for (var i2 = 0, len2 = arg.length; i2 < len2; i2++) {
-				/* jshint eqeqeq: false */
-				if (val[i1] == arg[i2]) {
+				if (toString(val[i1]) === toString(arg[i2])) {
 					continue loop;
 				}
 			}

tests/netteForms/spec/Nette.validatorsSpec.js

@@ -5,6 +5,11 @@ describe('Nette.validators', function() {
 		expect(Nette.validators.equal(null, '', 'a')).toBe(false);
 		expect(Nette.validators.equal(null, 'a', 'a')).toBe(true);
 		expect(Nette.validators.equal(null, 0, '0')).toBe(true);
+		expect(Nette.validators.equal(null, 0, '')).toBe(false);
+		expect(Nette.validators.equal(null, null, '')).toBe(true);
+		expect(Nette.validators.equal(null, false, '')).toBe(true);
+		expect(Nette.validators.equal(null, false, 0)).toBe(false);
+		expect(Nette.validators.equal(null, true, '1')).toBe(true);
 		expect(Nette.validators.equal(null, 'a', ['a'])).toBe(true);
 		expect(Nette.validators.equal(null, 'a', ['b'])).toBe(false);
 		expect(Nette.validators.equal(null, 'a', [])).toBe(true);