IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: don't make an ajax request when password or user is blank

Browse Source
This commit is contained in:
Sam
2014-08-18 12:50:25 +10:00
parent ad1ae911f7
commit 24932009a5
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/assets/javascripts/discourse/controllers/login.js.es6
View File

@@ -45,9 +45,15 @@ export default DiscourseController.extend(ModalFunctionality, {
actions: {
login: function() {
var self = this;
if(this.blank('loginName') || this.blank('loginPassword')){
self.flash(I18n.t('login.blank_username_or_password'), 'error');
return;
}
this.set('loggingIn', true);
var self = this;
Discourse.ajax("/session", {
data: { login: this.get('loginName'), password: this.get('loginPassword') },
type: 'POST'
@@ -75,11 +81,7 @@ export default DiscourseController.extend(ModalFunctionality, {
}, function() {
// Failed to login
if (self.blank('loginName') || self.blank('loginPassword')) {
self.flash(I18n.t('login.blank_username_or_password'), 'error');
} else {
self.flash(I18n.t('login.error'), 'error');
}
self.flash(I18n.t('login.error'), 'error');
self.set('loggingIn', false);
});