AC-10826 :: Storefront Bundle Checkbox Validation Error message count more than 1

Author: glo17720

lib/web/jquery/jquery.validate.js

@@ -31,6 +31,7 @@
 
             // Check if a validator for this form was already created
             var validator = $.data( this[ 0 ], "validator" );
+
             if ( validator ) {
                 return validator;
             }
@@ -235,6 +236,7 @@
         // https://jqueryvalidation.org/filled-selector/
         filled: function( a ) {
             var val = $( a ).val();
+
             return val !== null && !!trim( "" + val );
         },
 
@@ -256,6 +258,7 @@
         if ( arguments.length === 1 ) {
             return function() {
                 var args = $.makeArray( arguments );
+
                 args.unshift( source );
                 return $.validator.format.apply( this, args );
             };
@@ -406,6 +409,7 @@
                 var currentForm = this.currentForm,
                     groups = this.groups = {},
                     rules;
+
                 $.each( this.settings.groups, function( key, value ) {
                     if ( typeof value === "string" ) {
                         value = value.split( /\s/ );
@@ -420,7 +424,8 @@
                 } );
 
                 function delegate( event ) {
-                    var isContentEditable = typeof $( this ).attr( "contenteditable" ) !== "undefined" && $( this ).attr( "contenteditable" ) !== "false";
+                    var isContentEditable = typeof $( this ).attr( "contenteditable" ) !== "undefined"
+                        && $( this ).attr( "contenteditable" ) !== "false";
 
                     // Set form expando on contenteditable
                     if ( !this.form && isContentEditable ) {
@@ -437,6 +442,7 @@
                     var validator = $.data( this.form, "validator" ),
                         eventType = "on" + event.type.replace( /^validate/, "" ),
                         settings = validator.settings;
+
                     if ( settings[ eventType ] && !$( this ).is( settings.ignore ) ) {
                         settings[ eventType ].call( validator, this, event );
                     }
@@ -477,13 +483,13 @@
                 if ($(this.currentForm).find('.bundle').length > 0
                     && $(this.currentForm).find('input[type="checkbox"]').length > 0) {
                     return this.checkBundleForm();
-                } else {
-                    return this.checkDefaultForm();
                 }
+                return this.checkDefaultForm();
             },
 
             checkBundleForm: function() {
-                var group, optionNumber, elements, optionMap, el, option;
+                var optionNumber, elements, optionMap, el, option;
+
                 this.prepareForm();
                 elements = this.elements();
                 optionMap = {};
@@ -502,11 +508,13 @@
                 }
                 return this.valid();
             },
+
             processOptionGroup: function(group) {
                 if (group.length > 0) {
                     this.check(group[0]);
                 }
             },
+
             checkDefaultForm: function() {
                 this.prepareForm();
                 for (var i = 0, elements = (this.currentElements = this.elements()); elements[i]; i++) {
@@ -632,6 +640,7 @@
                 /* jshint unused: false */
                 var count = 0,
                     i;
+
                 for ( i in obj ) {
 
                     // This check allows counting elements with empty error
@@ -678,6 +687,7 @@
 
             findLastActive: function() {
                 var lastActive = this.lastActive;
+
                 return lastActive && $.grep( this.errorList, function( n ) {
                     return n.element.name === lastActive.name;
                 } ).length === 1 && lastActive;
@@ -694,7 +704,9 @@
                     .not( this.settings.ignore )
                     .filter( function() {
                         var name = this.name || $( this ).attr( "name" ); // For contenteditable
-                        var isContentEditable = typeof $( this ).attr( "contenteditable" ) !== "undefined" && $( this ).attr( "contenteditable" ) !== "false";
+
+                        var isContentEditable = typeof $( this ).attr( "contenteditable" ) !== "undefined"
+                            && $( this ).attr( "contenteditable" ) !== "false";
 
                         if ( !name && validator.settings.debug && window.console ) {
                             console.error( "%o has no name assigned", this );
@@ -727,6 +739,7 @@
 
             errors: function() {
                 var errorClass = this.settings.errorClass.split( " " ).join( "." );
+
                 return $( this.settings.errorElement + "." + errorClass, this.errorContext );
             },
 
@@ -883,6 +896,7 @@
             // Return the custom message for the given element name and validation method
             customMessage: function( name, method ) {
                 var m = this.settings.messages[ name ];
+
                 return m && ( m.constructor === String ? m : m[ method ] );
             },
 
@@ -951,6 +965,7 @@
 
             defaultShowErrors: function() {
                 var i, elements, error;
+
                 for ( i = 0; this.errorList[ i ]; i++ ) {
                     error = this.errorList[ i ];
                     if ( this.settings.highlight ) {
@@ -1148,6 +1163,7 @@
 
             optional: function( element ) {
                 var val = this.elementValue( element );
+
                 return !$.validator.methods.required.call( this, val, element ) && "dependency-mismatch";
             },
 
@@ -1319,6 +1335,7 @@
             }
 
             var meta = $.data(element.form, 'validator').settings.meta;
+
             return meta ?
                 $(element).metadata()[meta] :
                 $(element).metadata();
@@ -1364,6 +1381,7 @@
                 }
                 if ( val.param || val.depends ) {
                     var keepRule = true;
+
                     switch ( typeof val.depends ) {
                         case "string":
                             keepRule = !!$( val.depends, element.form ).length;
@@ -1375,7 +1393,7 @@
                     if ( keepRule ) {
                         rules[ prop ] = val.param !== undefined ? val.param : true;
                     } else {
-                        $.data( element.form, "validator" ).resetElements( $( element ) );
+                        $.data(element.form, "validator").resetElements($(element));
                         delete rules[ prop ];
                     }
                 }
@@ -1394,6 +1412,7 @@
             } );
             $.each( [ "rangelength", "range" ], function() {
                 var parts;
+
                 if ( rules[ this ] ) {
                     if ( Array.isArray( rules[ this ] ) ) {
                         rules[ this ] = [ Number( rules[ this ][ 0 ] ), Number( rules[ this ][ 1 ] ) ];
@@ -1426,6 +1445,7 @@
         normalizeRule: function( data ) {
             if ( typeof data === "string" ) {
                 var transformed = {};
+
                 $.each( data.split( /\s/ ), function() {
                     transformed[ this ] = true;
                 } );
@@ -1457,6 +1477,7 @@
 
                     // Could be an array for select-multiple or a string, both are fine this way
                     var val = $( element ).val();
+
                     return val && val.length > 0;
                 }
                 if ( this.checkable( element ) ) {
@@ -1578,8 +1599,7 @@
                     toInt = function( num ) {
                         return Math.round( num * Math.pow( 10, decimals ) );
                     },
-                    valid = true,
-                    decimals;
+                    valid = true;
 
                 // Works only for text, number and range input types
                 // TODO find a way to support input types date, datetime, datetime-local, month, time and week
@@ -1602,6 +1622,7 @@
 
                 // Bind to the blur event of the target in order to revalidate whenever the target field is updated
                 var target = $( param );
+
                 if ( this.settings.onfocusout && target.not( ".validate-equalTo-blur" ).length ) {
                     target.addClass( "validate-equalTo-blur" ).on( "blur.validate-equalTo", function() {
                         $( element ).valid();