From 83e6a4a57e32e40a99264faf20964877f7a6ab72 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki & Nathan Sobo Date: Thu, 16 May 2013 15:01:23 -0700 Subject: [PATCH] Rely on core:focus-next/previous in sign in view --- .../github-sign-in/keymaps/github-sign-in.cson | 2 -- .../github-sign-in/lib/sign-in-view.coffee | 16 ++++------------ 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/packages/github-sign-in/keymaps/github-sign-in.cson b/src/packages/github-sign-in/keymaps/github-sign-in.cson index 432c041fb..2f09562fa 100644 --- a/src/packages/github-sign-in/keymaps/github-sign-in.cson +++ b/src/packages/github-sign-in/keymaps/github-sign-in.cson @@ -1,9 +1,7 @@ '.sign-in-view': 'esc': 'core:cancel' '.sign-in-view input': - 'tab': 'next-field' 'meta-enter': 'core:confirm' '.sign-in-view button': - 'tab': 'next-field' 'enter': 'core:confirm' 'meta-enter': 'core:confirm' diff --git a/src/packages/github-sign-in/lib/sign-in-view.coffee b/src/packages/github-sign-in/lib/sign-in-view.coffee index f851e33fb..6b89acf95 100644 --- a/src/packages/github-sign-in/lib/sign-in-view.coffee +++ b/src/packages/github-sign-in/lib/sign-in-view.coffee @@ -13,32 +13,24 @@ class SignInView extends ScrollView @h4 'Sign in to GitHub' @p 'Your password will only be used to generate a token that will be stored in your keychain.' @div class: 'form-inline', => - @input outlet: 'username', type: 'text', placeholder: 'Username or Email' - @input outlet: 'password', type: 'password', placeholder: 'Password' - @button outlet: 'signIn', class: 'btn', disabled: 'disabled', 'Sign in' - @button outlet: 'cancel', class: 'btn', 'Cancel' + @input outlet: 'username', type: 'text', placeholder: 'Username or Email', tabindex: 1 + @input outlet: 'password', type: 'password', placeholder: 'Password', tabindex: 2 + @button outlet: 'signIn', class: 'btn', disabled: 'disabled', tabindex: 3, 'Sign in' + @button outlet: 'cancel', class: 'btn', tabindex: 4, 'Cancel' @div outlet: 'alert', class: 'alert alert-error' initialize: -> rootView.command 'github:sign-in', => @attach() - @username.on 'next-field', => @password.focus() @username.on 'core:confirm', => @generateOAuth2Token() @username.on 'input', => @validate() - @password.on 'next-field', => - if @isElementEnabled(@signIn) - @signIn.focus() - else - @cancel.focus() @password.on 'core:confirm', => @generateOAuth2Token() @password.on 'input', => @validate() - @signIn.on 'next-field', => @cancel.focus() @signIn.on 'core:confirm', => @generateOAuth2Token() @signIn.on 'click', => @generateOAuth2Token() - @cancel.on 'next-field', => @username.focus() @cancel.on 'core:confirm', => @generateOAuth2Token() @cancel.on 'click', => @detach()