diff --git a/app/assets/javascripts/discourse/templates/topic.js.handlebars b/app/assets/javascripts/discourse/templates/topic.js.handlebars index 49e1397b0..0773abaad 100644 --- a/app/assets/javascripts/discourse/templates/topic.js.handlebars +++ b/app/assets/javascripts/discourse/templates/topic.js.handlebars @@ -57,6 +57,7 @@ {{#if loadingAbove}}
{{i18n loading}}
{{/if}} + {{collection itemViewClass="Discourse.PostView" contentBinding="content.posts" topicViewBinding="view"}} {{#if loadingBelow}} diff --git a/app/assets/javascripts/discourse/views/modal/create_account_view.js b/app/assets/javascripts/discourse/views/modal/create_account_view.js index 7e705db20..99e9b8011 100644 --- a/app/assets/javascripts/discourse/views/modal/create_account_view.js +++ b/app/assets/javascripts/discourse/views/modal/create_account_view.js @@ -280,7 +280,7 @@ Discourse.CreateAccountView = Discourse.ModalBodyView.extend({ // but only when the submit button is enabled var _this = this; return Em.run.next(function() { - return $("input[type='text']").keydown(function(e) { + return $("input[type='text'], input[type='password']").keydown(function(e) { if (_this.get('submitDisabled') === false && e.keyCode === 13) { return _this.createAccount(); }