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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index ef1cc2fc86fe2b17ceb91cdac389e276587fb45a..3bb8a602dfb1b5dc9012e6dbcfd1f3c30e6e7f5b 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -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)

diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 91da192290589e7243de65d5019a0888ff78fdbc..4d039cde1283972b28011531af835e4d5363c196 100644 (file)
--- 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();
   }
 }