浏览代码

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
tags/5.1.0
Go MAEDA 1年前
父节点
当前提交
5c5ae4637c
共有 2 个文件被更改,包括 3 次插入10 次删除
  1. 2
    8
      app/views/account/login.html.erb
  2. 1
    2
      app/views/sudo_mode/new.html.erb

+ 2
- 8
app/views/account/login.html.erb 查看文件

<%= back_url_hidden_field_tag %> <%= back_url_hidden_field_tag %>
<label for="username"><%=l(:field_login)%></label> <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"> <label for="password">
<%=l(:field_password)%> <%=l(:field_password)%>
<%= link_to l(:label_password_lost), lost_password_path, :class => "lost_password" if Setting.lost_password? %> <%= link_to l(:label_password_lost), lost_password_path, :class => "lost_password" if Setting.lost_password? %>
</label> </label>
<%= password_field_tag 'password', nil, :tabindex => '2' %>
<%= password_field_tag 'password', nil, :tabindex => '2', :autofocus => params[:username].present? %>
<% if Setting.autologin? %> <% if Setting.autologin? %>
<label for="autologin"><%= check_box_tag 'autologin', 1, false, :tabindex => 4 %> <%= l(:label_stay_logged_in) %></label> <label for="autologin"><%= check_box_tag 'autologin', 1, false, :tabindex => 4 %> <%= l(:label_stay_logged_in) %></label>
</div> </div>


<%= call_hook :view_account_login_bottom %> <%= call_hook :view_account_login_bottom %>

<% if params[:username].present? %>
<%= javascript_tag "$('#password').focus();" %>
<% else %>
<%= javascript_tag "$('#username').focus();" %>
<% end %>

+ 1
- 2
app/views/sudo_mode/new.html.erb 查看文件

<div class="box"> <div class="box">
<p> <p>
<label for="sudo_password"><%= l :field_password %><span class="required">*</span></label> <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? %> </br><%= link_to l(:label_password_lost), lost_password_path, :class => "lost_password" if Setting.lost_password? %>
</p> </p>
</div> </div>
<%= submit_tag l(:button_submit) %> <%= submit_tag l(:button_submit) %>
<% end %> <% end %>
<%= javascript_tag "$('#sudo_password').focus();" %>

正在加载...
取消
保存