Merge pull request #216 from magento-nord/develop

[NORD] Bugs
magento · Nov 30, 2015 · a76952f · a76952f
2 parents dce931b + 28709d5
commit a76952f
Showing 1 changed file with 10 additions and 15 deletions.
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
@@ -57,34 +57,29 @@ define([
          * @param {Object} elem
          */
         validate: function (elem) {
-            var source = this.source,
-                result  = elem.delegate('validate'),
-                invalid = false;
+            var result  = elem.delegate('validate'),
+                invalid;
 
-            _.some(result, function (item) {
-                return !item.valid && (invalid = item.target);
+            invalid = _.find(result, function (item) {
+                return !item.valid;
             });
 
-            if (invalid && !source.get('params.invalid')) {
-                source.set('params.invalid', true);
-
+            if (invalid) {
                 elem.activate();
-                invalid.focused(true);
+                invalid.target.focused(true);
             }
+
+            return invalid;
         },
 
         /**
          * Sets 'allValid' property of instance to true, then calls 'validate' method
          * of instance for each element.
          */
         onValidate: function () {
-            var elems;
-
-            elems = this.elems.sortBy(function (elem) {
+            this.elems.sortBy(function (elem) {
                 return !elem.active();
-            });
-
-            elems.forEach(this.validate, this);
+            }).some(this.validate, this);
         }
     });
 });