From 93a92d2bf067b4670d2eb7a389e348f8c75b24ff Mon Sep 17 00:00:00 2001 From: jlukic Date: Tue, 14 Jul 2015 17:10:46 -0400 Subject: [PATCH] #2636 Tests & Fixes 0, 1, and 2 conditions for minLength, maxLength and exactLength --- src/definitions/behaviors/form.js | 41 ++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/src/definitions/behaviors/form.js b/src/definitions/behaviors/form.js index 2d9f6ada2..433507f1c 100644 --- a/src/definitions/behaviors/form.js +++ b/src/definitions/behaviors/form.js @@ -760,9 +760,11 @@ $.fn.form = function(parameters) { ancillary, functionType ; - // cast to string - value = $.trim($field.val() + ''); - + // cast to string avoiding encoding special values + value = (value === undefined || value === '' || value === null) + ? '' + : $.trim(value + '') + ; // if bracket notation is used, pass in extra parameters if(bracket) { ancillary = '' + bracket[1]; @@ -1185,19 +1187,34 @@ $.fn.form.settings = { ; }, - maxCount: function(value, count) { - value = value.split(','); - return ($.isArray(value) && value.length <= count); + exactCount: function(value, exactCount) { + if(exactCount == 0) { + return (value === ''); + } + if(exactCount == 1) { + return (value !== '' && value.search(',') === -1); + } + return (value.split(',').length == exactCount); }, - exactCount: function(value, count) { - value = value.split(','); - return ($.isArray(value) && value.length == count); + minCount: function(value, minCount) { + if(minCount == 0) { + return true; + } + if(minCount == 1) { + return (value !== ''); + } + return (value.split(',').length >= minCount); }, - minCount: function(value, count) { - value = value.split(','); - return ($.isArray(value) && value.length >= count); + maxCount: function(value, maxCount) { + if(maxCount == 0) { + return false; + } + if(maxCount == 1) { + return (value.search(',') === -1); + } + return (value.split(',').length <= maxCount); }, regExp: function(value, regExp) {