Move setTimeout hack to where focus actually happens (bug 956959)

mozilla · Apr 28, 2014 · 5302c84 · 5302c84
1 parent fa1fbd6
commit 5302c84
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/media/js/cli.js b/media/js/cli.js
@@ -142,8 +142,13 @@ define('cli', ['settings', 'longtext', 'tracking'], function(settings, checkLong
                 console.log('[cli] has nothing toShow');
             }
             if ($pinBox.length && !$pinBox.hasClass('error')) {
-                console.log('[cli] Focusing pin');
-                $input.focus();
+                // Delay required for FFOX 1.3 / FF Android (bug 956959)
+                // Otherwise focus is lost on first load despite the keyboard
+                // being already up.
+                window.setTimeout(function() {
+                    console.log('[cli] Focusing pin');
+                    $input.focus();
+                }, 250);
             }
         },
         trackWebpayClick: function(e) {

diff --git a/media/js/pin/pin.js b/media/js/pin/pin.js
@@ -163,10 +163,7 @@ require(['cli'], function(cli) {
         box.html(Array(PINLENGTH+1).join('<span'+pinClass+'></span>'));
         $el.prepend(box);
         console.log('[pin] requesting focus on pin');
-        // Required for FFOX 1.3 / FF Android (bug 956959)
-        window.setTimeout(function() {
-            cli.focusOnPin();
-        }, 750);
+        cli.focusOnPin();
     });
 
     if (cli.hasTouch) {