Merge pull request mozilla-b2g#33356 from begeeben/1227816_the_defaul…

…t_highlight Bug 1227816 - [TV] The default highlight button on browser FTE is incorrect, r=rexboy
evelynhung · Nov 26, 2015 · 10798fe · 10798fe
2 parents 86959c4 + 6f3b1e4
commit 10798fe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/shared/js/smart-screen/f_t_e_wizard.js b/shared/js/smart-screen/f_t_e_wizard.js
@@ -161,6 +161,10 @@
                                     getElementsByClassName(this._buttonsClass));
 
     this._simpleKeyNavigation.updateList(list);
+    // Default focus on the finish button
+    if (list.indexOf(this._finishButton) !== -1) {
+      this._simpleKeyNavigation.focusOn(this._finishButton);
+    }
   };
 
   FTEWizard.prototype._hide = function fw_hide(pageIdx) {

diff --git a/tv_apps/browser/elements/fte.html b/tv_apps/browser/elements/fte.html
@@ -7,7 +7,7 @@ <h1 class="fte-greeting" data-l10n-id="fte-welcome"></h1>
       <img class="fte-diagram" src="../style/images/account_image.png"></img>
       <div class="fte-button-container">
         <smart-button id="fte-skip" class="fte-button" type="rounded-corner-text" data-l10n-id="skip" data-behavior="skip"></smart-button>
-        <smart-button id="fte-sign-in" class="fte-button primary" type="rounded-corner-text" class="primary" data-l10n-id="login" data-behavior="finish"></smart-button>
+        <smart-button id="fte-sign-in" class="fte-button fte-finish primary" type="rounded-corner-text" class="primary" data-l10n-id="login" data-behavior="finish"></smart-button>
       </div>
     </div>
   </div>