From d763f08ba81f0e3e4aac9c09f0342a2a53254211 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Tue, 28 Jun 2005 09:47:56 +0000 Subject: Fix the Event.findElement prototype function. Needed to get autocomplete working with Safari #1528 [Thomas Fuchs] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1547 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_view/helpers/javascripts/prototype.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'actionpack') diff --git a/actionpack/lib/action_view/helpers/javascripts/prototype.js b/actionpack/lib/action_view/helpers/javascripts/prototype.js index bba61b91a0..02d103498e 100644 --- a/actionpack/lib/action_view/helpers/javascripts/prototype.js +++ b/actionpack/lib/action_view/helpers/javascripts/prototype.js @@ -797,9 +797,9 @@ Object.extend(Event, { // find the first node with the given tagName, starting from the // node the event was triggered on; traverses the DOM upwards findElement: function(event, tagName) { - element = Event.element(event); - while (element.tagName.toUpperCase() != tagName.toUpperCase() - && element.parentNode) + var element = Event.element(event); + while (element.parentNode && (!element.tagName || + (element.tagName.toUpperCase() != tagName.toUpperCase()))) element = element.parentNode; return element; }, -- cgit v1.2.3