From fe7206cf7a32ba6a66fe961720cf1b663667c234 Mon Sep 17 00:00:00 2001
From: "sspitzer%netscape.com" <sspitzer%netscape.com>
Date: Sun, 23 Mar 2003 17:38:51 +0000
Subject: [PATCH] landing neil's fix for bug #196755 [mailviews] [modern skin
 only] Unable to create new Views (pull down menus do not retain changes)
 r=jkeiser, sr=jag

---
 .../resources/content/bindings/menulist.xml    | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/xpfe/global/resources/content/bindings/menulist.xml b/xpfe/global/resources/content/bindings/menulist.xml
index bbaa3d88fe9b..69e88e54f84b 100644
--- a/xpfe/global/resources/content/bindings/menulist.xml
+++ b/xpfe/global/resources/content/bindings/menulist.xml
@@ -24,12 +24,20 @@
     </content>
 
     <handlers>
-      <handler event="command" phase="capturing"
-        action="if (event.target.parentNode.parentNode == this) this.selectedItem = event.target;"/>
+      <handler event="command" phase="capturing">
+        <![CDATA[
+          // XXX see bug #196755
+          // originalTarget is workaround for arrowscrollbox retargeting bug
+          if (event.originalTarget.parentNode.parentNode == this)
+            this.selectedItem = event.originalTarget;
+        ]]>
+      </handler>
         
       <handler event="popupshowing">
         <![CDATA[
-          if (event.target.parentNode == this && this.selectedItem)
+          // XXX see bug #196755
+          // originalTarget is workaround for arrowscrollbox retargeting bug
+          if (event.originalTarget.parentNode == this && this.selectedItem)
             // Not ready for auto-setting the active child in hierarchies yet.
             // For now, only do this when the outermost menupopup opens.
             this.menuBoxObject.activeChild = this.selectedInternal;
@@ -402,7 +410,9 @@
         <![CDATA[
           // editable menulists elements aren't in the focus order,
           // so when the popup opens we need to force the focus to the inputField
-          if (event.target.parentNode == this) {
+          // XXX see bug #196755
+          // originalTarget is workaround for arrowscrollbox retargeting bug
+          if (event.originalTarget.parentNode == this) {
             if (document.commandDispatcher.focusedElement != this.inputField) 
               this.inputField.focus();