|
33 | 33 | }); |
34 | 34 |
|
35 | 35 | /* |
36 | | - * Validate confirmation |
| 36 | + * Validate confirmation (tests that two inputs are identical; usually used for |
| 37 | + * passwords) |
37 | 38 | */ |
38 | 39 | $.formUtils.addValidator({ |
39 | 40 | name : 'confirmation', |
40 | 41 | validatorFunction : function(value, $el, config, language, $form) { |
41 | | - var conf = '', |
42 | | - confInputName = $el.valAttr('confirm') || ($el.attr('name') + '_confirmation'), |
43 | | - $confInput = $form.find('[name="' +confInputName+ '"]').eq(0); |
44 | | - |
45 | | - if ($confInput.length) { |
46 | | - conf = $confInput.val(); |
47 | | - if( config.validateOnBlur && !$confInput[0].hasValidationCallback ) { |
48 | | - $confInput[0].hasValidationCallback = true; |
49 | | - var keyUpCallback = function() { |
50 | | - $el.validate(); |
51 | | - }; |
52 | | - $confInput.on('keyup', keyUpCallback); |
53 | | - $form.one('formValidationSetup', function() { |
54 | | - $confInput[0].hasValidationCallback = false; |
55 | | - $confInput.off('keyup', keyUpCallback); |
56 | | - }); |
57 | | - } |
58 | | - } else { |
| 42 | + var password, |
| 43 | + passwordInputName = $el.valAttr('confirm') || |
| 44 | + ($el.attr('name') + '_confirmation'), |
| 45 | + $passwordInput = $form.find('[name="' +passwordInputName+ '"]'); |
| 46 | + if (!$passwordInput.length) { |
59 | 47 | $.formUtils.warn('Password confirmation validator: could not find an input ' + |
60 | | - 'with name "'+confInputName+'"'); |
| 48 | + 'with name "'+passwordInputName+'"'); |
61 | 49 | return false; |
62 | 50 | } |
63 | 51 |
|
64 | | - return value === conf; |
| 52 | + password = $passwordInput.val(); |
| 53 | + if( config.validateOnBlur && !$passwordInput[0].hasValidationCallback ) { |
| 54 | + $passwordInput[0].hasValidationCallback = true; |
| 55 | + var keyUpCallback = function() { |
| 56 | + $el.validate(); |
| 57 | + }; |
| 58 | + $passwordInput.on('keyup', keyUpCallback); |
| 59 | + $form.one('formValidationSetup', function() { |
| 60 | + $passwordInput[0].hasValidationCallback = false; |
| 61 | + $passwordInput.off('keyup', keyUpCallback); |
| 62 | + }); |
| 63 | + } |
| 64 | + |
| 65 | + return value === password; |
65 | 66 | }, |
66 | 67 | errorMessage : '', |
67 | 68 | errorMessageKey: 'notConfirmed' |
|
0 commit comments