From 47446a5a99d4104ac6efa30fa16ce15595a968a9 Mon Sep 17 00:00:00 2001
From: Dmitry Brusensky <brussens@hoswac.ru>
Date: Mon, 23 Nov 2020 23:07:40 +0300
Subject: [PATCH] Fix #18386: Fix `assets/yii.activeForm.js` incorrect target
 selector for `validatingCssClass`

---
 framework/CHANGELOG.md             |  1 +
 framework/assets/yii.activeForm.js | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index 0191225ba2..2688128aa5 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -4,6 +4,7 @@ Yii Framework 2 Change Log
 2.0.40 under development
 ------------------------
 
+- Bug #18386: Fix `assets/yii.activeForm.js` incorrect target selector for `validatingCssClass` (brussens)
 - Enh #18381: The `yii\web\AssetManager` `$basePath` readable and writeable check has been moved to the `checkBasePathPermission()`. This check will run once before `publishFile()` and `publishDirectory()` (nadar)
 - Bug #18199: Fix content body response on 304 HTTP status code, according to RFC 7232 (rad8329)
 - Enh #18394: Add support for setting `yii\web\Response::$stream` to a callable (brandonkelly)
diff --git a/framework/assets/yii.activeForm.js b/framework/assets/yii.activeForm.js
index 0c1ccb0f77..34d334686f 100644
--- a/framework/assets/yii.activeForm.js
+++ b/framework/assets/yii.activeForm.js
@@ -569,7 +569,13 @@
             $.each(data.attributes, function () {
                 if (this.status === 2) {
                     this.status = 3;
-                    $form.find(this.container).addClass(data.settings.validatingCssClass);
+
+                    var $container = $form.find(this.container),
+                        $input = findInput($form, this);
+
+                    var $errorElement = data.settings.validationStateOn === 'input' ? $input : $container;
+
+                    $errorElement.addClass(data.settings.validatingCssClass);
                 }
             });
             methods.validate.call($form);
@@ -917,4 +923,4 @@
             $form.find(attribute.input).attr('aria-invalid', hasError ? 'true' : 'false');
         }
     }
-})(window.jQuery);
\ No newline at end of file
+})(window.jQuery);