1
0
mirror of https://github.com/meineerde/redmine.git synced 2026-03-10 19:23:06 +00:00

Merged r21867 from trunk to 5.0-stable (#37473).

git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@21868 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2022-09-28 09:20:39 +00:00
parent 59852ed845
commit 534103f42d
2 changed files with 2 additions and 2 deletions

View File

@ -334,7 +334,7 @@ module ApplicationHelper
def toggle_link(name, id, options={})
onclick = +"$('##{id}').toggle(); "
onclick << (options[:focus] ? "$('##{options[:focus]}').focus(); " : "this.blur(); ")
onclick << (options[:focus] ? "$('##{options[:focus]}:visible').focus(); " : "this.blur(); ")
onclick << "$(window).scrollTop($('##{options[:focus]}').position().top); " if options[:scroll]
onclick << "return false;"
link_to(name, "#", :onclick => onclick)

View File

@ -958,7 +958,7 @@ function addFormObserversForDoubleSubmit() {
function defaultFocus(){
if (($('#content :focus').length == 0) && (window.location.hash == '')) {
$('#content input[type=text], #content textarea').first().focus();
$('#content input[type=text]:visible, #content textarea:visible').first().focus();
}
}