enable universal use of modal and tab_group, allow having child eleme…

…nts which do not need to be validated
magento · Sep 6, 2017 · 4687f71 · 4687f71
1 parent 6f25236
commit 4687f71
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/tab_group.js b/app/code/Magento/Ui/view/base/web/js/form/components/tab_group.js
@@ -65,7 +65,7 @@ define([
                 invalid;
 
             invalid = _.find(result, function (item) {
-                return !item.valid;
+                return typeof item !== 'undefined' && !item.valid;
             });
 
             if (invalid) {

diff --git a/app/code/Magento/Ui/view/base/web/js/modal/modal-component.js b/app/code/Magento/Ui/view/base/web/js/modal/modal-component.js
@@ -229,6 +229,9 @@ define([
          * Validate everything validatable in modal
          */
         validate: function (elem) {
+            if (typeof elem === 'undefined') {
+                return;
+            }
             if (typeof elem.validate === 'function') {
                 this.valid = this.valid & elem.validate().valid;
             } else if (elem.elems) {