Added SubmitHandler support

bbraithwaite · bbraithwaite · commit 9827ce50cf4c · 2013-01-30T16:32:29.000Z
diff --git a/Default.aspx b/Default.aspx
@@ -4,7 +4,7 @@
     <title>Multiple Form Validation</title>
     <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
     <script type="text/javascript" src="http://ajax.aspnetcdn.com/ajax/jquery.validate/1.9/jquery.validate.min.js"></script>
-    <script type="text/javascript" src="jquery.validation.net.webforms.js"></script>
+    <script type="text/javascript" src="jquery.validation.net.webforms.min.js"></script>
     <script type="text/javascript">
         $(function() {
             $("#aspForm").validateWebForm();
diff --git a/SubmitHandlerExample.aspx b/SubmitHandlerExample.aspx
@@ -0,0 +1,58 @@
+﻿<%@ Page Language="VB" AutoEventWireup="false" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head id="Head1" runat="server">
+    <title>Multiple Form Validation</title>
+    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
+    <script type="text/javascript" src="http://ajax.aspnetcdn.com/ajax/jquery.validate/1.9/jquery.validate.min.js"></script>
+    <script type="text/javascript" src="jquery.validation.net.webforms.min.js"></script>
+    <script type="text/javascript">
+        $(function () {
+            $("#aspForm").validateWebForm({
+                submitHandler: function (form) {
+                    alert("Called Submit Handler");
+                }
+            });
+        });
+    </script>
+    <style type="text/css">
+        .error {
+            color: red;
+        }
+    </style>
+</head>
+<body>
+    <form id="aspForm" runat="server">
+        <fieldset class="form" id="signup">
+            <div class="something">
+                <ul></ul>
+            </div>
+            <legend>Sign Up</legend>
+            <p>
+                <asp:Label ID="uiFirstName" runat="server" AssociatedControlID="uxFirstName" Text="First name:"></asp:Label>
+                <asp:TextBox ID="uxFirstName" runat="server" CssClass="required"></asp:TextBox>
+            </p>
+            <p>
+                <asp:Button ID="uxRegister" runat="server" Text="Sign Up" CssClass="submit signup" />
+                <asp:Button ID="uxCancelRegister" runat="server" Text="Cancel" />
+            </p>
+        </fieldset>
+        <fieldset class="form" id="login">
+            <legend>Login</legend>
+            <p>
+                <asp:Label ID="uiUserName" runat="server" AssociatedControlID="uxUserName" Text="User name:"></asp:Label>
+                <asp:TextBox ID="uxUserName" runat="server" CssClass="required email"></asp:TextBox>
+            </p>
+            <p>
+                <asp:Label ID="Label1" runat="server" AssociatedControlID="uxPassword" Text="Password:"></asp:Label>
+                <asp:TextBox ID="uxPassword" runat="server" CssClass="required" TextMode="Password"></asp:TextBox>
+            </p>
+            <p>
+                <asp:Button ID="uxLogin" runat="server" Text="Login" CssClass="submit login" />
+                <asp:Button ID="uxCancelSignUp" runat="server" Text="Cancel" />
+            </p>
+        </fieldset>
+    </form>
+</body>
+</html>
diff --git a/jquery.validation.net.webforms.js b/jquery.validation.net.webforms.js
@@ -1,5 +1,5 @@
 ﻿/**
-* jquery.validation.net.webforms.js v1.0.0
+* jquery.validation.net.webforms.js v1.1.0
 * https://github.com/bbraithwaite/JQueryValidationForWebForms
 * ===================================================
 *
@@ -13,7 +13,6 @@
 (function ($) {
 
     $.extend($.fn, {
-        // http://docs.jquery.com/Plugins/Validation/validate
         validateWebForm: function (options) {
 
             var form = $(this[0]),
@@ -57,12 +56,13 @@
         validateAndSubmit: function (event) {
 
             var group = $(this).getValidationContainer(event.currentTarget),
-                isValid = true;
+                isValid = true,
+                settings = $("form").validate().settings;
 
             group.find(':input').each(function (i, item) {
                 if (!$(item).valid()) {
 
-                    if ($("form").validate().settings.focusInvalid && isValid)
+                    if (settings.focusInvalid && isValid)
                         $(item).focus();
 
                     isValid = false;
@@ -71,6 +71,11 @@
 
             if (!isValid) {
                 event.preventDefault();
+            } else {
+                if (settings.submitHandler) {
+                    settings.submitHandler();
+                    event.preventDefault();
+                }
             }
         }
     });
diff --git a/jquery.validation.net.webforms.min.js b/jquery.validation.net.webforms.min.js
