diff options
| author | Go MAEDA <maeda@farend.jp> | 2022-09-28 09:21:57 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2022-09-28 09:21:57 +0000 |
| commit | 80f1374fc913d152d5c872d50af979d881d40552 (patch) | |
| tree | 696bad60dd7f6bc9a80d1e405622e118b59b1e0b | |
| parent | 898b8311a63279ae10f6cc38ebf5c7f872a8ee25 (diff) | |
| download | redmine-80f1374fc913d152d5c872d50af979d881d40552.tar.gz redmine-80f1374fc913d152d5c872d50af979d881d40552.zip | |
Merged r21867 from trunk to 4.2-stable (#37473).
git-svn-id: https://svn.redmine.org/redmine/branches/4.2-stable@21869 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/helpers/application_helper.rb | 2 | ||||
| -rw-r--r-- | public/javascripts/application.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 166bca849..e016df3cb 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -319,7 +319,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) diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 098417420..c1d619780 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -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(); } } |