From f53db0f2e24c5de67bc43566e1103cf7d53edf80 Mon Sep 17 00:00:00 2001
From: Laurence Tennant <hyperreality@users.noreply.github.com>
Date: Wed, 14 Dec 2016 02:51:19 +0000
Subject: [PATCH] Better autofocus (#1664)

---
 .../articles/client/views/admin/form-article.client.view.html | 2 +-
 modules/core/client/directives/auto-focus.client.directive.js | 4 +++-
 modules/users/client/views/admin/edit-user.client.view.html   | 2 +-
 .../client/views/password/forgot-password.client.view.html    | 2 +-
 .../client/views/password/reset-password.client.view.html     | 2 +-
 .../client/views/settings/change-password.client.view.html    | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/articles/client/views/admin/form-article.client.view.html b/modules/articles/client/views/admin/form-article.client.view.html
index 15f05dbee8..ead0d67304 100644
--- a/modules/articles/client/views/admin/form-article.client.view.html
+++ b/modules/articles/client/views/admin/form-article.client.view.html
@@ -12,7 +12,7 @@ <h1>{{vm.article._id ? 'Edit Article' : 'New Article'}}</h1>
       <fieldset>
         <div class="form-group" show-errors>
           <label class="control-label" for="title">Title</label>
-          <input name="title" type="text" ng-model="vm.article.title" id="title" class="form-control" placeholder="Title" required>
+          <input name="title" type="text" ng-model="vm.article.title" id="title" class="form-control" placeholder="Title" required autofocus>
           <div ng-messages="vm.form.articleForm.title.$error" role="alert">
             <p class="help-block error-text" ng-message="required">Article title is required.</p>
           </div>
diff --git a/modules/core/client/directives/auto-focus.client.directive.js b/modules/core/client/directives/auto-focus.client.directive.js
index 0cebc7ddba..a8307fcbcc 100644
--- a/modules/core/client/directives/auto-focus.client.directive.js
+++ b/modules/core/client/directives/auto-focus.client.directive.js
@@ -20,7 +20,9 @@
     function link(scope, element, attrs) {
       if ($window.innerWidth >= 800) {
         $timeout(function() {
-          element[0].focus();
+          var el = element[0];
+          el.focus();
+          el.selectionStart = el.selectionEnd = el.value.length;
         }, 100);
       }
     }
diff --git a/modules/users/client/views/admin/edit-user.client.view.html b/modules/users/client/views/admin/edit-user.client.view.html
index 3687a28095..b029246c11 100644
--- a/modules/users/client/views/admin/edit-user.client.view.html
+++ b/modules/users/client/views/admin/edit-user.client.view.html
@@ -7,7 +7,7 @@ <h1>User <span ng-bind="vm.user.username"></span></h1>
       <fieldset>
         <div class="form-group" show-errors>
           <label for="firstName">First Name</label>
-          <input type="text" id="firstName" name="firstName" class="form-control" ng-model="vm.user.firstName" placeholder="First Name" required />
+          <input type="text" id="firstName" name="firstName" class="form-control" ng-model="vm.user.firstName" placeholder="First Name" required autofocus />
           <div ng-messages="vm.userForm.firstName.$error" role="alert">
             <p class="help-block error-text" ng-message="required">First name is required.</p>
           </div>
diff --git a/modules/users/client/views/password/forgot-password.client.view.html b/modules/users/client/views/password/forgot-password.client.view.html
index b549ee70a6..47a6fa83a1 100644
--- a/modules/users/client/views/password/forgot-password.client.view.html
+++ b/modules/users/client/views/password/forgot-password.client.view.html
@@ -5,7 +5,7 @@ <h3 class="col-md-12 text-center">Restore your password</h3>
     <form name="vm.forgotPasswordForm" ng-submit="vm.askForPasswordReset(vm.forgotPasswordForm.$valid)" class="form-horizontal" novalidate autocomplete="off">
       <fieldset>
         <div class="form-group" show-errors>
-          <input type="text" id="username" name="username" class="form-control" ng-model="vm.credentials.username" placeholder="Username" lowercase required>
+          <input type="text" id="username" name="username" class="form-control" ng-model="vm.credentials.username" placeholder="Username" lowercase required autofocus>
           <div ng-messages="vm.forgotPasswordForm.username.$error" role="alert">
             <p class="help-block error-text" ng-message="required">Enter a username.</p>
           </div>
diff --git a/modules/users/client/views/password/reset-password.client.view.html b/modules/users/client/views/password/reset-password.client.view.html
index be7f4e7cc8..7ce662ccbb 100644
--- a/modules/users/client/views/password/reset-password.client.view.html
+++ b/modules/users/client/views/password/reset-password.client.view.html
@@ -5,7 +5,7 @@ <h3 class="col-md-12 text-center">Reset your password</h3>
       <fieldset>
         <div class="form-group" show-errors>
           <label for="newPassword">New Password</label>
-          <input type="password" id="newPassword" name="newPassword" class="form-control" ng-model="vm.passwordDetails.newPassword" placeholder="New Password" autocomplete="new-password" uib-popover="{{vm.getPopoverMsg()}}" uib-popover-trigger="focus" uib-popover-placement="top" password-validator required>
+          <input type="password" id="newPassword" name="newPassword" class="form-control" ng-model="vm.passwordDetails.newPassword" placeholder="New Password" autocomplete="new-password" uib-popover="{{vm.getPopoverMsg()}}" uib-popover-trigger="focus" uib-popover-placement="top" password-validator required autofocus>
           <div ng-messages="vm.resetPasswordForm.newPassword.$error" role="alert">
             <p class="help-block error-text" ng-message="required">Enter a new password.</p>
             <div ng-repeat="passwordError in passwordErrors">
diff --git a/modules/users/client/views/settings/change-password.client.view.html b/modules/users/client/views/settings/change-password.client.view.html
index f01dfd5aed..8d99f6b935 100644
--- a/modules/users/client/views/settings/change-password.client.view.html
+++ b/modules/users/client/views/settings/change-password.client.view.html
@@ -4,7 +4,7 @@
       <fieldset>
         <div class="form-group" show-errors>
           <label for="currentPassword">Current Password</label>
-          <input type="password" id="currentPassword" name="currentPassword" class="form-control" ng-model="vm.passwordDetails.currentPassword" placeholder="Current Password" required>
+          <input type="password" id="currentPassword" name="currentPassword" class="form-control" ng-model="vm.passwordDetails.currentPassword" placeholder="Current Password" required autofocus>
           <div ng-messages="vm.passwordForm.currentPassword.$error" role="alert">
             <p class="help-block error-text" ng-message="required">Your current password is required.</p>
           </div>