Merge branch 'master' of github.com:discourse/discourse

This commit is contained in:
Neil Lalonde 2013-03-11 10:44:40 -04:00
commit 37cf8b7d38
1 changed files with 13 additions and 2 deletions

View File

@ -276,8 +276,19 @@ Discourse.CreateAccountView = Discourse.ModalBodyView.extend({
_this.set('formSubmitted', false);
return _this.flash(Em.String.i18n('create_account.failed'), 'error');
});
},
didInsertElement: function(e) {
// allows the submission the form when pressing 'ENTER' on *any* text input field
// but only when the submit button is enabled
var _this = this;
return Em.run.next(function() {
return $("input[type='text']").keydown(function(e) {
if (_this.get('submitDisabled') === false && e.keyCode === 13) {
return _this.createAccount();
}
});
});
}
});