removed messages if the validation doesnt fail

Merge remote-tracking branch 'remotes/upstream/staging' into username Conflicts: administrator/language/en-GB/en-GB.com_users.ini
joomla · Sep 30, 2016 · a8f6ae3 · a8f6ae3
1 parent 48196ad
commit a8f6ae3
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/media/com_users/js/validate-user.js b/media/com_users/js/validate-user.js
@@ -12,6 +12,7 @@
                     type: 'POST',
                     url: ajaxUrl + '&username=' + name
                 }).done(function(data){
+                    Joomla.removeMessages();
                     if(data.success){
                         message = {
                             'warning' : [data.message]
@@ -35,6 +36,7 @@
                     type: 'POST',
                     url:  ajaxUrl + '&email=' + mail
                 }).done(function (data) {
+                    Joomla.removeMessages();
                     if (data.success) {
                         message = {
                             'warning': [data.message]
@@ -59,6 +61,8 @@
                         'warning' : [ Joomla.JText._('COM_USERS_PROFILE_EMAIL2_MESSAGE') ]
                     };
                     Joomla.renderMessages(message);
+                }else{
+                    Joomla.removeMessages();
                 }
             }
         });
@@ -72,6 +76,8 @@
                         'warning' : [ Joomla.JText._('COM_USERS_FIELD_RESET_PASSWORD1_MESSAGE')]
                     };
                     Joomla.renderMessages(message);
+                }else{
+                    Joomla.removeMessages();
                 }
             }
         });