From 1b9cbe4284eda458d795eadfed578631065cec9f Mon Sep 17 00:00:00 2001
From: aleth <aleth@instantbird.org>
Date: Thu, 30 Aug 2012 00:34:21 +0200
Subject: [PATCH] Bug 955056 - Some screen readers say the word "frame" a lot
 when moving the selection in the contacts list, r=florian.

---
 im/content/blist.js    | 10 ++++++++++
 im/content/blist.xul   |  1 +
 im/content/contact.xml | 10 ++++++++++
 3 files changed, 21 insertions(+)

diff --git a/im/content/blist.js b/im/content/blist.js
index 48bd213ad4..7c9ed11f96 100644
--- a/im/content/blist.js
+++ b/im/content/blist.js
@@ -785,6 +785,16 @@ var buddyList = {
     if (!item || !item.parentNode) // empty list or item no longer in the list
       return;
     item.keyPress(aEvent);
+  },
+
+  buddylistboxFocus: function() {
+    let selectedItem = document.getElementById("buddylistbox").selectedItem;
+    if (selectedItem) {
+      // Ensure binding changes immediately to avoid the firing of a
+      // spurious accessibility focus event referring to the old binding that
+      // causes problems for screen readers (BIO bug 1626, BMO bug 786508)
+      selectedItem.getBoundingClientRect();
+    }
   }
 };
 
diff --git a/im/content/blist.xul b/im/content/blist.xul
index 4952d19e15..fa610986dd 100644
--- a/im/content/blist.xul
+++ b/im/content/blist.xul
@@ -156,6 +156,7 @@
            crop="end" class="listboxHeader"/>
     <richlistbox id="buddylistbox"
                  onkeypress="buddyList.keyPress(event);"
+                 onfocus="buddyList.buddylistboxFocus();"
                  tooltip="buddyTooltip"/>
     <spacer id="listSpacer" flex="1"/>
   </notificationbox>
diff --git a/im/content/contact.xml b/im/content/contact.xml
index 4b6916be39..b6d1ad2585 100644
--- a/im/content/contact.xml
+++ b/im/content/contact.xml
@@ -511,6 +511,16 @@
          this._DragLeave();
        ]]>
      </handler>
+     <handler event="DOMAttrModified">
+       <![CDATA[
+         if (event.attrName != "selected" || !event.newValue)
+           return;
+         // Ensure binding changes immediately to avoid the firing of a
+         // spurious accessibility focus event referring to the old binding
+         // that causes problems for screen readers (bugs BIO 1626, BMO 786508)
+         this.getBoundingClientRect();
+       ]]>
+     </handler>
     </handlers>
   </binding>