Merge pull request TryGhost#5628 from cobbspur/keypress

Enter key submits form in setup step 2
acburdine · Aug 4, 2015 · 1751daa · 1751daa
2 parents cfce197 + c104e7f
commit 1751daa
Showing 1 changed file with 4 additions and 11 deletions.
diff --git a/core/client/app/templates/setup/two.hbs b/core/client/app/templates/setup/two.hbs
@@ -11,35 +11,28 @@
         {{#gh-form-group errors=errors property="email"}}
             <label for="email-address">Email address</label>
             <span class="input-icon icon-mail">
-                {{gh-input type="email" name="email" placeholder="Eg. [email protected]" class="gh-input" autofocus="autofocus" autocorrect="off" value=email focusOut=(action "handleEmail")}}
+                {{gh-input type="email" name="email" enter=(action "setup") placeholder="Eg. [email protected]" class="gh-input" autofocus="autofocus" autocorrect="off" value=email focusOut=(action "handleEmail")}}
             </span>
             {{gh-error-message errors=errors property="email"}}
         {{/gh-form-group}}
         {{#gh-form-group errors=errors property="name"}}
             <label for="full-name">Full name</label>
             <span class="input-icon icon-user">
-                {{gh-input type="text" name="name" placeholder="Eg. John H. Watson" class="gh-input" autofocus="autofocus" autocorrect="off" value=name focusOut=(action "validate" "name")}}
+                {{gh-input type="text" name="name" enter=(action "setup") placeholder="Eg. John H. Watson" class="gh-input" autofocus="autofocus" autocorrect="off" value=name focusOut=(action "validate" "name")}}
             </span>
             {{gh-error-message errors=errors property="name"}}
         {{/gh-form-group}}
         {{#gh-form-group errors=errors property="password"}}
             <label for="password">Password</label>
             <span class="input-icon icon-lock">
-                {{gh-input type="password" name="password" placeholder="At least 8 characters" class="gh-input" autofocus="autofocus" autocorrect="off" value=password focusOut=(action "validate" "password")}}
-                <div class="pw-strength">
-                    <div class="pw-strength-dot"></div>
-                    <div class="pw-strength-dot"></div>
-                    <div class="pw-strength-dot"></div>
-                    <div class="pw-strength-dot"></div>
-                    <div class="pw-strength-dot <!--pw-strength-activedot-->"></div>
-                </div>
+                {{gh-input type="password" name="password" enter=(action "setup") placeholder="At least 8 characters" class="gh-input" autofocus="autofocus" autocorrect="off" value=password focusOut=(action "validate" "password")}}
             </span>
             {{gh-error-message errors=errors property="password"}}
         {{/gh-form-group}}
         {{#gh-form-group errors=errors property="blogTitle"}}
             <label for="blog-title">Blog title</label>
             <span class="input-icon icon-content">
-                {{gh-input type="text" name="blog-title" placeholder="Eg. The Daily Awesome" class="gh-input" autofocus="autofocus" autocorrect="off" value=blogTitle focusOut=(action "validate" "blogTitle")}}
+                {{gh-input type="text" name="blog-title" enter=(action "setup") placeholder="Eg. The Daily Awesome" class="gh-input" autofocus="autofocus" autocorrect="off" value=blogTitle focusOut=(action "validate" "blogTitle")}}
             </span>
             {{gh-error-message errors=errors property="blogTitle"}}
         {{/gh-form-group}}