diff options
| -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 70634f6ab..ced1845eb 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -336,7 +336,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 91da19229..4d039cde1 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(); } } |