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

Author: glo17720

lib/web/jquery/jquery.validate.js

@@ -404,7 +404,7 @@
                 this.reset();
 
                 var currentForm = this.currentForm,
-                    groups = ( this.groups = {} ),
+                    groups = this.groups = {},
                     rules;
                 $.each( this.settings.groups, function( key, value ) {
                     if ( typeof value === "string" ) {
@@ -444,9 +444,12 @@
 
                 $( this.currentForm )
                     .on( "focusin.validate focusout.validate keyup.validate",
-                        ":text, [type='password'], [type='file'], select, textarea, [type='number'], [type='search'], " +
-                        "[type='tel'], [type='url'], [type='email'], [type='datetime'], [type='date'], [type='month'], " +
-                        "[type='week'], [type='time'], [type='datetime-local'], [type='range'], [type='color'], " +
+                        ":text, [type='password'], [type='file'], " +
+                        "select, textarea, [type='number'], [type='search'], " +
+                        "[type='tel'], [type='url'], [type='email'], " +
+                        "[type='datetime'], [type='date'], [type='month'], " +
+                        "[type='week'], [type='time'], [type='datetime-local'], " +
+                        "[type='range'], [type='color'], " +
                         "[type='radio'], [type='checkbox'], [contenteditable], [type='button']", delegate )
 
                     // Support: Chrome, oldIE
@@ -471,34 +474,45 @@
             },
 
             checkForm: function() {
-                if ($(this.currentForm).find('.bundle').length > 0) {
-                    this.prepareForm();
-                    var elements = this.elements();
-                    var optionMap = {};
-                    for (var i = 0; i < elements.length; i++) {
-                        var el = elements[i];
-                        var optionNumber = el.id.split('-')[2];
-                        if (!optionMap[optionNumber]) {
-                            optionMap[optionNumber] = [];
-                        }
-                        optionMap[optionNumber].push(el);
-                    }
-                    for (var option in optionMap) {
-                        if (optionMap.hasOwnProperty(option)) {
-                            var group = optionMap[option];
-                            if (group.length > 0) {
-                                this.check(group[0]);
-                            }
-                        }
-                    }
-                    return this.valid();
+                if ($(this.currentForm).find('.bundle').length > 0
+                    && $(this.currentForm).find('input[type="checkbox"]').length > 0) {
+                    return this.checkBundleForm();
                 } else {
-                    this.prepareForm();
-                    for ( var i = 0, elements = ( this.currentElements = this.elements() ); elements[ i ]; i++ ) {
-                        this.check( elements[ i ] );
+                    return this.checkDefaultForm();
+                }
+            },
+
+            checkBundleForm: function() {
+                var group, optionNumber, elements, optionMap, el, option;
+                this.prepareForm();
+                elements = this.elements();
+                optionMap = {};
+                for (var i = 0; i < elements.length; i++) {
+                    el = elements[i];
+                    optionNumber = el.id.split('-')[2];
+                    if (!optionMap[optionNumber]) {
+                        optionMap[optionNumber] = [];
+                    }
+                    optionMap[optionNumber].push(el);
+                }
+                for (option in optionMap) {
+                    if (optionMap.hasOwnProperty(option)) {
+                        this.processOptionGroup(optionMap[option]);
                     }
-                    return this.valid();
                 }
+                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++) {
+                    this.check(elements[i]);
+                }
+                return this.valid();
             },
 
             // https://jqueryvalidation.org/Validator.element/
@@ -1309,7 +1323,6 @@
                 $(element).metadata()[meta] :
                 $(element).metadata();
         },
-        
         dataRules: function( element ) {
             var rules = {},
                 $element = $( element ),
@@ -1512,18 +1525,21 @@
             // https://jqueryvalidation.org/minlength-method/
             minlength: function( value, element, param ) {
                 var length = Array.isArray( value ) ? value.length : this.getLength( value, element );
+
                 return this.optional( element ) || length >= param;
             },
 
             // https://jqueryvalidation.org/maxlength-method/
             maxlength: function( value, element, param ) {
                 var length = Array.isArray( value ) ? value.length : this.getLength( value, element );
+
                 return this.optional( element ) || length <= param;
             },
 
             // https://jqueryvalidation.org/rangelength-method/
             rangelength: function( value, element, param ) {
                 var length = Array.isArray( value ) ? value.length : this.getLength( value, element );
+
                 return this.optional( element ) || ( length >= param[ 0 ] && length <= param[ 1 ] );
             },
 
@@ -1558,6 +1574,7 @@
                         // Number of digits right of decimal point.
                         return match[ 1 ] ? match[ 1 ].length : 0;
                     },
+                    decimals = 0,
                     toInt = function( num ) {
                         return Math.round( num * Math.pow( 10, decimals ) );
                     },
@@ -1628,7 +1645,7 @@
                     data: data,
                     context: validator.currentForm,
                     success: function( response ) {
-                        var valid = response === true || response === "true",
+                        var valid = response === true || response === 'true',
                             errors, message, submitted;
 
                         validator.settings.messages[ element.name ][ method ] = previous.originalMessage;