From 7777b3f65049333bfc6bf1fedf7882fc5a881d29 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Wed, 13 Mar 2013 17:59:24 -0400
Subject: [PATCH] Autofocus on first field in signup form
---
.../discourse/templates/modal/create_account.js.handlebars | 2 +-
.../javascripts/discourse/views/discourse_text_field.js | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/app/assets/javascripts/discourse/templates/modal/create_account.js.handlebars b/app/assets/javascripts/discourse/templates/modal/create_account.js.handlebars
index fd9fed933..1c8b34d58 100644
--- a/app/assets/javascripts/discourse/templates/modal/create_account.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/modal/create_account.js.handlebars
@@ -6,7 +6,7 @@
<tr>
<td style="width:80px"><label for='new-account-name'>{{i18n user.name.title}}</label></td>
<td style="width:496px">
- {{view Ember.TextField valueBinding="view.accountName" elementId="new-account-name"}}
+ {{view Discourse.TextField valueBinding="view.accountName" elementId="new-account-name" autofocus="autofocus"}}
{{view Discourse.InputTipView validationBinding="view.nameValidation"}}
</td>
</tr>
diff --git a/app/assets/javascripts/discourse/views/discourse_text_field.js b/app/assets/javascripts/discourse/views/discourse_text_field.js
index 879640c98..19d6953d7 100644
--- a/app/assets/javascripts/discourse/views/discourse_text_field.js
+++ b/app/assets/javascripts/discourse/views/discourse_text_field.js
@@ -10,7 +10,11 @@ Discourse.TextField = Ember.TextField.extend({
attributeBindings: ['autocorrect', 'autocapitalize', 'autofocus'],
placeholder: (function() {
- return Em.String.i18n(this.get('placeholderKey'));
+ if( this.get('placeholderKey') ) {
+ return Em.String.i18n(this.get('placeholderKey'));
+ } else {
+ return '';
+ }
}).property('placeholderKey')
});