From 61ba708469b1582e5dcee66f984015c792970b17 Mon Sep 17 00:00:00 2001
From: "mats.palmgren%bredband.net"
 <mats.palmgren%bredband.net@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 5 Aug 2006 22:18:26 +0000
Subject: [PATCH] Pressing accesskey for label should focus the target element
 after the label click event. b=346529 r+sr=bzbarsky

git-svn-id: svn://10.0.0.236/trunk@206645 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/content/events/src/nsEventStateManager.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mozilla/content/events/src/nsEventStateManager.cpp b/mozilla/content/events/src/nsEventStateManager.cpp
index c5188383028..a124664ae1a 100644
--- a/mozilla/content/events/src/nsEventStateManager.cpp
+++ b/mozilla/content/events/src/nsEventStateManager.cpp
@@ -1222,9 +1222,11 @@ nsEventStateManager::HandleAccessKey(nsPresContext* aPresContext,
         }
       } else { // otherwise, it must be HTML
         // It's hard to say what HTML4 wants us to do in all cases.
-        // So for now we'll settle for A) Set focus
-        ChangeFocusWith(content, eEventFocusedByKey);
-
+        // So for now we'll settle for A) Set focus (except for <label>s
+        // which focus their control in nsHTMLLabelElement::PostHandleEvent)
+        if (content->Tag() != nsHTMLAtoms::label || !sKeyCausesActivation) {
+          ChangeFocusWith(content, eEventFocusedByKey);
+        }
         if (sKeyCausesActivation) {
           // B) Click on it if the users prefs indicate to do so.