From 66f1ea932b19eb74cf0476495e8b6835990aed56 Mon Sep 17 00:00:00 2001
From: "shliang%netscape.com" <shliang%netscape.com>
Date: Wed, 27 Mar 2002 02:27:47 +0000
Subject: [PATCH] bug 129879 - removing menu accel from menulist menuitem
 binding. r=andreww,sr=hewitt,a=asa

---
 xpfe/global/resources/content/bindings/menu.xml | 17 +++++++++++------
 xpfe/global/resources/content/xul.css           |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/xpfe/global/resources/content/bindings/menu.xml b/xpfe/global/resources/content/bindings/menu.xml
index 103ed45a7a5f..4e1fd55df747 100644
--- a/xpfe/global/resources/content/bindings/menu.xml
+++ b/xpfe/global/resources/content/bindings/menu.xml
@@ -68,7 +68,7 @@
     </content>
   </binding>
 
-  <binding id="menuitem-iconic" extends="chrome://global/content/bindings/menu.xml#menuitem-base">
+  <binding id="menuitem-iconic" extends="chrome://global/content/bindings/menu.xml#menuitem">
     <content>
       <xul:hbox class="menu-iconic-left" align="center" pack="center"
                inherits="selected,disabled,checked">
@@ -77,11 +77,16 @@
       <xul:label class="menu-iconic-text" flex="1" inherits="value=label,accesskey,crop" crop="right"/>
       <xul:label class="menu-iconic-accel" inherits="value=acceltext"/>
     </content>
-    
-    <implementation>
-      <property name="value" onset="this.setAttribute('value',val); return val;"
-                            onget="return this.getAttribute('value');"/>
-    </implementation>  
+  </binding>
+
+  <binding id="menuitem-iconic-noaccel" extends="chrome://global/content/bindings/menu.xml#menuitem">
+    <content>
+      <xul:hbox class="menu-iconic-left" align="center" pack="center"
+               inherits="selected,disabled,checked">
+        <xul:image class="menu-iconic-icon" inherits="validate,src"/>
+      </xul:hbox>
+      <xul:label class="menu-iconic-text" flex="1" inherits="value=label,accesskey,crop" crop="right"/>
+    </content>
   </binding>
 
   <binding id="menu-iconic" extends="chrome://global/content/bindings/menu.xml#menuitem-base">
diff --git a/xpfe/global/resources/content/xul.css b/xpfe/global/resources/content/xul.css
index c1d2edc3c593..b051a84551dc 100644
--- a/xpfe/global/resources/content/xul.css
+++ b/xpfe/global/resources/content/xul.css
@@ -714,7 +714,7 @@ menulist[editable] {
 }
 
 menulist > menupopup > menuitem {
-  -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic");
+  -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic-noaccel");
 }
 
 dropmarker[type="menu"] {