Merge branch 'MDL-56296-master' of git://github.com/damyon/moodle

moodle · Nov 2, 2016 · 2f8b51f · 2f8b51f
2 parents f5d9072 + 7744f89
commit 2f8b51f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/theme/boost/amd/build/form-display-errors.min.js b/theme/boost/amd/build/form-display-errors.min.js
diff --git a/theme/boost/amd/src/form-display-errors.js b/theme/boost/amd/src/form-display-errors.js
@@ -31,15 +31,19 @@ define(['jquery', 'core/event'], function($, Event) {
                 var feedback = parent.find('.form-control-feedback');
                 if (msg !== '') {
                     parent.addClass('has-danger');
+                    parent.data('client-validation-error', true);
                     $(element).addClass('form-control-danger');
                     $(element).attr('aria-describedby', $(element).attr('id') + '-feedback');
                     feedback.html(msg);
                     feedback.show();
                 } else {
-                    parent.removeClass('has-danger');
-                    $(element).removeClass('form-control-danger');
-                    $(element).attr('aria-describedby', '');
-                    feedback.hide();
+                    if (parent.data('client-validation-error') === true) {
+                        parent.removeClass('has-danger');
+                        parent.data('client-validation-error', false);
+                        $(element).removeClass('form-control-danger');
+                        $(element).attr('aria-describedby', '');
+                        feedback.hide();
+                    }
                 }
             });
         }