From 60bdbb514a160805a30645f9e0835293e533b94d Mon Sep 17 00:00:00 2001 From: jlukic Date: Tue, 21 Jan 2014 13:37:36 -0500 Subject: [PATCH] Fixes form add prompt to be more comprehensive, easier to work with, Fixes #567 #541 --- src/modules/behavior/form.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/modules/behavior/form.js b/src/modules/behavior/form.js index 2ec8d994d..589a9164e 100755 --- a/src/modules/behavior/form.js +++ b/src/modules/behavior/form.js @@ -224,14 +224,18 @@ $.fn.form = function(fields, parameters) { }, add: { - prompt: function(field, errors) { + prompt: function(identifier, errors) { var - $field = module.get.field(field.identifier), + $field = module.get.field(identifier), $fieldGroup = $field.closest($group), $prompt = $fieldGroup.find(selector.prompt), promptExists = ($prompt.size() !== 0) ; - module.verbose('Adding inline error', field); + errors = (typeof errors == 'string') + ? [errors] + : errors + ; + module.verbose('Adding field error state', identifier); $fieldGroup .addClass(className.error) ; @@ -257,6 +261,9 @@ $.fn.form = function(fields, parameters) { ; } } + else { + module.verbose('Inline errors are disabled, no inline error added', identifier); + } } }, errors: function(errors) { @@ -348,7 +355,7 @@ $.fn.form = function(fields, parameters) { } else { formErrors = formErrors.concat(fieldErrors); - module.add.prompt(field, fieldErrors); + module.add.prompt(field.identifier, fieldErrors); $.proxy(settings.onInvalid, $field)(fieldErrors); return false; }