ENGCOM-5197: [Backport] Fix wrong behavior of validation scroll #23086

magento · Jun 3, 2019 · 3214013 · 3214013
2 parents 73f2d45 + 31bd492
commit 3214013
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/lib/web/mage/validation.js b/lib/web/mage/validation.js
@@ -990,8 +990,8 @@
                         minValidRange = $.mage.parseNumber(validRange[1]);
                         maxValidRange = $.mage.parseNumber(validRange[2]);
                         result = result &&
-                        (isNaN(minValidRange) || minValue >= minValidRange) &&
-                        (isNaN(maxValidRange) || maxValue <= maxValidRange);
+                            (isNaN(minValidRange) || minValue >= minValidRange) &&
+                            (isNaN(maxValidRange) || maxValue <= maxValidRange);
                     }
                 }
 
@@ -1109,8 +1109,8 @@
                     options = p.find('input');
 
                 return options.map(function (el) {
-                        return $(el).val();
-                    }).length > 0;
+                    return $(el).val();
+                }).length > 0;
             },
             $.mage.__('Please select one of the options above.')
         ],
@@ -1922,15 +1922,15 @@
          * @param {jQuery.Event} event
          * @param {Object} validation
          */
-        listenFormValidateHandler:  function (event, validation) {
+        listenFormValidateHandler: function (event, validation) {
             var firstActive = $(validation.errorList[0].element || []),
                 lastActive = $(validation.findLastActive() ||
                     validation.errorList.length && validation.errorList[0].element || []),
-                parent, windowHeight, successList;
+                windowHeight = $(window).height(),
+                parent, successList;
 
             if (lastActive.is(':hidden')) {
                 parent = lastActive.parent();
-                windowHeight = $(window).height();
                 $('html, body').animate({
                     scrollTop: parent.offset().top - windowHeight / 2
                 });
@@ -1948,8 +1948,8 @@
             }
 
             if (firstActive.length) {
-                $('html, body').stop().animate({
-                    scrollTop: firstActive.offset().top
+                $('body').stop().animate({
+                    scrollTop: firstActive.offset().top - windowHeight / 2
                 });
                 firstActive.focus();
             }