From edc5c9e81bd755aed9d730eefe0997a1c5283b19 Mon Sep 17 00:00:00 2001
From: Mark Striemer <mstriemer@mozilla.com>
Date: Fri, 7 Nov 2014 11:26:01 -0600
Subject: [PATCH] Focus the FxA popup email field (bug 1095056)

Fixes #777
---
 src/media/js/views/fxa_popup.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/media/js/views/fxa_popup.js b/src/media/js/views/fxa_popup.js
index 2ef7178ea1..d66fa35ff2 100644
--- a/src/media/js/views/fxa_popup.js
+++ b/src/media/js/views/fxa_popup.js
@@ -92,6 +92,14 @@ define('views/fxa_popup',
             setEmail(user.get_setting('email'));
         }
 
+        z.page.one('loaded', function() {
+            // Let the `loaded` event handler in main.js hide the splash before
+            // focusing the email field.
+            setTimeout(function() {
+                emailField.focus();
+            });
+        });
+
         function redirectToFxA(action, preVerifyToken) {
             var url = login.get_fxa_auth_url() +
                 '&email=' + encodeURIComponent(email) +