diff --git a/jquery.validation.net.webforms.js b/jquery.validation.net.webforms.js index 608d510..e1e568e 100644 --- a/jquery.validation.net.webforms.js +++ b/jquery.validation.net.webforms.js @@ -35,7 +35,9 @@ // Cause the form to validate when the enter key is pressed. // It is a requirement to catch the enter key press as the default // browser action would submit the form bypassing the validation event thus validating all groups. - if (event.keyCode == 13) { + + // If the element is a textarea, we don“t submit the form + if (event.keyCode == 13 && event.target.nodeName!='TEXTAREA') { $(event.currentTarget).closest(".form").find(".submit").click(); return false; } diff --git a/jquery.validation.net.webforms.min.js b/jquery.validation.net.webforms.min.js index 6e23f93..89e9cff 100644 --- a/jquery.validation.net.webforms.min.js +++ b/jquery.validation.net.webforms.min.js @@ -1 +1 @@ -(function (e) { e.extend(e.fn, { validateWebForm: function (t) { var n = e(this[0]), r = n.length && n.is("form"); if (r) { if (!t) { t = {} } t.onsubmit = false; this.validate(t); e(".form :input").keydown(function (t) { if (t.keyCode == 13) { e(t.currentTarget).closest(".form").find(".submit").click(); return false } }); n.getSumbitControls().click(this.validateAndSubmit); return this } return undefined }, getSumbitControls: function () { return e(this).find(".form .submit") }, getValidationContainer: function (t) { return e(t).closest(".form") }, validateAndSubmit: function (t) { var n = e(this).getValidationContainer(t.currentTarget), r = true, i = e("form").validate().settings; n.find(":input").each(function (t, n) { if (!e(n).valid()) { if (i.focusInvalid && r) e(n).focus(); r = false } }); if (!r) { t.preventDefault() } else { if (i.submitHandler) { i.submitHandler(); t.preventDefault() } } } }) })(jQuery) \ No newline at end of file +(function (e) { e.extend(e.fn, { validateWebForm: function (t) { var n = e(this[0]), r = n.length && n.is("form"); if (r) { if (!t) { t = {} } t.onsubmit = false; this.validate(t); e(".form :input").keydown(function (t) { if (t.keyCode == 13 && t.target.nodeName!='TEXTAREA') { e(t.currentTarget).closest(".form").find(".submit").click(); return false } }); n.getSumbitControls().click(this.validateAndSubmit); return this } return undefined }, getSumbitControls: function () { return e(this).find(".form .submit") }, getValidationContainer: function (t) { return e(t).closest(".form") }, validateAndSubmit: function (t) { var n = e(this).getValidationContainer(t.currentTarget), r = true, i = e("form").validate().settings; n.find(":input").each(function (t, n) { if (!e(n).valid()) { if (i.focusInvalid && r) e(n).focus(); r = false } }); if (!r) { t.preventDefault() } else { if (i.submitHandler) { i.submitHandler(); t.preventDefault() } } } }) })(jQuery) \ No newline at end of file