Skip to content
Browse files

Made Field.focus in prototype friendly to effects by adding optional …

…delay parameter [DHH]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3366 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 89d8afa commit d7487fffe51d03f46800e266e4c972ab55238c89 @dhh dhh committed Dec 31, 2005
View
14 actionpack/lib/action_view/helpers/javascripts/prototype.js
@@ -1154,8 +1154,18 @@ var Field = {
$(arguments[i]).value = '';
},
- focus: function(element) {
- $(element).focus();
+ // Pass the field id or element as the first parameter and optionally a triggering delay in micro-seconds as the second.
+ // The delay is useful when the focus is part of effects that won't finish instantly since they prevent the focus from
+ // taking hold. Set the delay to right after the effect finishes and the focus will work.
+ focus: function() {
+ element = $(arguments[0]);
+ delay = arguments[1];
+
+ if (delay) {
+ setTimeout(function() { $(element).focus(); }, delay)
+ } else {
+ $(element).focus();
+ }
},
present: function() {
View
1 activerecord/test/reflection_test.rb
@@ -98,5 +98,6 @@ def test_reflection_of_all_associations
assert_equal 12, Firm.reflect_on_all_associations.size
assert_equal 11, Firm.reflect_on_all_associations(:has_many).size
assert_equal 1, Firm.reflect_on_all_associations(:has_one).size
+ assert_equal 0, Firm.reflect_on_all_associations(:belongs_to).size
end
end
View
14 railties/html/javascripts/prototype.js
@@ -1154,8 +1154,18 @@ var Field = {
$(arguments[i]).value = '';
},
- focus: function(element) {
- $(element).focus();
+ // Pass the field id or element as the first parameter and optionally a triggering delay in micro-seconds as the second.
+ // The delay is useful when the focus is part of effects that won't finish instantly since they prevent the focus from
+ // taking hold. Set the delay to right after the effect finishes and the focus will work.
+ focus: function() {
+ element = $(arguments[0]);
+ delay = arguments[1];
+
+ if (delay) {
+ setTimeout(function() { $(element).focus(); }, delay)
+ } else {
+ $(element).focus();
+ }
},
present: function() {

0 comments on commit d7487ff

Please sign in to comment.
Something went wrong with that request. Please try again.