diff options
| author | Go MAEDA <maeda@farend.jp> | 2022-08-06 05:00:28 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2022-08-06 05:00:28 +0000 |
| commit | 5c5ae4637c903279f6297aa73a7b0035d3bfb59d (patch) | |
| tree | 30da903385caa6eaf1fde53cb5508d38784d9a32 /app | |
| parent | ca89202a2eee523a556b918b83e92bf7a4a113f9 (diff) | |
| download | redmine-5c5ae4637c903279f6297aa73a7b0035d3bfb59d.tar.gz redmine-5c5ae4637c903279f6297aa73a7b0035d3bfb59d.zip | |
Replace JQuery `.focus()` method with HTML `autofocus` attribute (#37482).
Patch by Go MAEDA.
git-svn-id: https://svn.redmine.org/redmine/trunk@21762 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/account/login.html.erb | 10 | ||||
| -rw-r--r-- | app/views/sudo_mode/new.html.erb | 3 |
2 files changed, 3 insertions, 10 deletions
diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb index 38991ae60..27878bc7e 100644 --- a/app/views/account/login.html.erb +++ b/app/views/account/login.html.erb @@ -5,13 +5,13 @@ <%= back_url_hidden_field_tag %> <label for="username"><%=l(:field_login)%></label> - <%= text_field_tag 'username', params[:username], :tabindex => '1' %> + <%= text_field_tag 'username', params[:username], :tabindex => '1', :autofocus => params[:username].blank? %> <label for="password"> <%=l(:field_password)%> <%= link_to l(:label_password_lost), lost_password_path, :class => "lost_password" if Setting.lost_password? %> </label> - <%= password_field_tag 'password', nil, :tabindex => '2' %> + <%= password_field_tag 'password', nil, :tabindex => '2', :autofocus => params[:username].present? %> <% if Setting.autologin? %> <label for="autologin"><%= check_box_tag 'autologin', 1, false, :tabindex => 4 %> <%= l(:label_stay_logged_in) %></label> @@ -22,9 +22,3 @@ </div> <%= call_hook :view_account_login_bottom %> - -<% if params[:username].present? %> -<%= javascript_tag "$('#password').focus();" %> -<% else %> -<%= javascript_tag "$('#username').focus();" %> -<% end %> diff --git a/app/views/sudo_mode/new.html.erb b/app/views/sudo_mode/new.html.erb index 6532dc4a9..cd25ea1d6 100644 --- a/app/views/sudo_mode/new.html.erb +++ b/app/views/sudo_mode/new.html.erb @@ -8,10 +8,9 @@ <div class="box"> <p> <label for="sudo_password"><%= l :field_password %><span class="required">*</span></label> - <%= password_field_tag :sudo_password, nil, size: 25 %> + <%= password_field_tag :sudo_password, nil, size: 25, autofocus: true %> </br><%= link_to l(:label_password_lost), lost_password_path, :class => "lost_password" if Setting.lost_password? %> </p> </div> <%= submit_tag l(:button_submit) %> <% end %> -<%= javascript_tag "$('#sudo_password').focus();" %> |