From 18e758c3ca71510c2b643054180702b41a333c47 Mon Sep 17 00:00:00 2001
From: "hyatt%netscape.com" <hyatt%netscape.com>
Date: Tue, 5 Sep 2000 22:52:57 +0000
Subject: [PATCH] fix for 51410 - xbl syntax change, r=danm

---
 content/xbl/src/nsXBLBinding.cpp                     | 10 +++++++---
 layout/xbl/src/nsXBLBinding.cpp                      | 10 +++++++---
 .../resources/content/mailComposeBindings.xml        |  2 +-
 themes/blue/communicator/menubuttonBindings.xml      |  4 ++--
 themes/classic/communicator/menubuttonBindings.xml   |  2 +-
 themes/classic/global/mac/classicBindings.xml        |  4 ++--
 themes/classic/global/menubuttonBindings.xml         |  2 +-
 themes/classic/global/win/classicBindings.xml        | 12 ++++++------
 themes/modern/communicator/menubuttonBindings.xml    |  4 ++--
 themes/modern/global/globalBindings.xml              |  6 +++---
 .../resources/content/dialogBindings.xml             |  6 +++---
 .../console/resources/content/consoleBindings.xml    | 12 ++++++------
 xpfe/global/resources/content/dialogBindings.xml     |  6 +++---
 xpfe/global/resources/content/menulistBindings.xml   | 10 +++++-----
 xpfe/global/resources/content/toolbarBindings.xml    |  6 +++---
 xpfe/global/resources/content/xulBindings.xml        |  6 +++---
 16 files changed, 55 insertions(+), 47 deletions(-)

diff --git a/content/xbl/src/nsXBLBinding.cpp b/content/xbl/src/nsXBLBinding.cpp
index 9810789b15b3..33d6e3f3a921 100644
--- a/content/xbl/src/nsXBLBinding.cpp
+++ b/content/xbl/src/nsXBLBinding.cpp
@@ -1538,15 +1538,15 @@ nsXBLBinding::ConstructAttributeTable(nsIContent* aElement)
 
       // Figure out if this token contains a :. 
       nsAutoString attrTok; attrTok.AssignWithConversion(token);
-      PRInt32 index = attrTok.Find(":", PR_TRUE);
+      PRInt32 index = attrTok.Find("=", PR_TRUE);
       if (index != -1) {
         // This attribute maps to something different.
         nsAutoString left, right;
         attrTok.Left(left, index);
         attrTok.Right(right, attrTok.Length()-index-1);
 
-        atom = getter_AddRefs(NS_NewAtom(left.GetUnicode()));
-        attribute = getter_AddRefs(NS_NewAtom(right.GetUnicode()));
+        atom = getter_AddRefs(NS_NewAtom(right.GetUnicode()));
+        attribute = getter_AddRefs(NS_NewAtom(left.GetUnicode()));
       }
       else {
         nsAutoString tok; tok.AssignWithConversion(token);
@@ -1600,6 +1600,10 @@ nsXBLBinding::ConstructAttributeTable(nsIContent* aElement)
         }
       }
 
+      // Now remove the inherits attribute from the cloned element.  It is used
+      // on the template only, and we don't need it anymore.
+      aElement->UnsetAttribute(kNameSpaceID_None, kInheritsAtom, PR_FALSE);
+
       token = nsCRT::strtok( newStr, ", ", &newStr );
     }
 
diff --git a/layout/xbl/src/nsXBLBinding.cpp b/layout/xbl/src/nsXBLBinding.cpp
index 9810789b15b3..33d6e3f3a921 100644
--- a/layout/xbl/src/nsXBLBinding.cpp
+++ b/layout/xbl/src/nsXBLBinding.cpp
@@ -1538,15 +1538,15 @@ nsXBLBinding::ConstructAttributeTable(nsIContent* aElement)
 
       // Figure out if this token contains a :. 
       nsAutoString attrTok; attrTok.AssignWithConversion(token);
-      PRInt32 index = attrTok.Find(":", PR_TRUE);
+      PRInt32 index = attrTok.Find("=", PR_TRUE);
       if (index != -1) {
         // This attribute maps to something different.
         nsAutoString left, right;
         attrTok.Left(left, index);
         attrTok.Right(right, attrTok.Length()-index-1);
 
-        atom = getter_AddRefs(NS_NewAtom(left.GetUnicode()));
-        attribute = getter_AddRefs(NS_NewAtom(right.GetUnicode()));
+        atom = getter_AddRefs(NS_NewAtom(right.GetUnicode()));
+        attribute = getter_AddRefs(NS_NewAtom(left.GetUnicode()));
       }
       else {
         nsAutoString tok; tok.AssignWithConversion(token);
@@ -1600,6 +1600,10 @@ nsXBLBinding::ConstructAttributeTable(nsIContent* aElement)
         }
       }
 
+      // Now remove the inherits attribute from the cloned element.  It is used
+      // on the template only, and we don't need it anymore.
+      aElement->UnsetAttribute(kNameSpaceID_None, kInheritsAtom, PR_FALSE);
+
       token = nsCRT::strtok( newStr, ", ", &newStr );
     }
 
diff --git a/mailnews/compose/resources/content/mailComposeBindings.xml b/mailnews/compose/resources/content/mailComposeBindings.xml
index 3c8aac94e3e9..4077b368e1d0 100644
--- a/mailnews/compose/resources/content/mailComposeBindings.xml
+++ b/mailnews/compose/resources/content/mailComposeBindings.xml
@@ -10,7 +10,7 @@ extends="chrome://global/content/xulBindings.xml#menuitem">
     <content autostretch="never" excludes="template,observes,menupopup">
       <xul:text class="composemenu-text" inherits="value,accesskey,crop"
 crop="right"/>
-      <xul:text class="composemenu-text-2" inherits="accountname:value"
+      <xul:text class="composemenu-text-2" inherits="value=accountname"
 crop="right"/>
     </content>
   </binding>
diff --git a/themes/blue/communicator/menubuttonBindings.xml b/themes/blue/communicator/menubuttonBindings.xml
index 959f814b59db..53485099fed7 100644
--- a/themes/blue/communicator/menubuttonBindings.xml
+++ b/themes/blue/communicator/menubuttonBindings.xml
@@ -9,7 +9,7 @@
     <content excludes="observes,template,menupopup">
       <xul:stack>
         <xul:button class="menubutton-dual-button button-toolbar-1 top" allowevents="true" 
-                    inherits="buttontooltiptext:tooltiptext,buttonaction:oncommand,src,value,crop,accesskey,disabled"/>
+                    inherits="tooltiptext=buttontooltiptext,oncommand=buttonaction,src,value,crop,accesskey,disabled"/>
         <xul:box class="menubutton-dual-dropmarker-box" autostretch="never" valign="bottom" flex="1">
           <xul:image class="menubutton-dual-dropmarker" inherits="disabled"/>
         </xul:box>
@@ -21,7 +21,7 @@
     <content excludes="observes,template,menupopup">
       <xul:stack>
         <xul:button class="menubutton-dual-button button-toolbar-2 top" allowevents="true" 
-                    inherits="buttontooltiptext:tooltiptext,buttonaction:oncommand,src,value,crop,accesskey,disabled"/>
+                    inherits="tooltiptext=buttontooltiptext,oncommand=buttonaction,src,value,crop,accesskey,disabled"/>
         <xul:box class="menubutton-dual-dropmarker-box" autostretch="never" valign="bottom" flex="1">
           <xul:image class="menubutton-dual-dropmarker" inherits="disabled"/>
         </xul:box>
diff --git a/themes/classic/communicator/menubuttonBindings.xml b/themes/classic/communicator/menubuttonBindings.xml
index 32d407d11b28..f70691ce8289 100644
--- a/themes/classic/communicator/menubuttonBindings.xml
+++ b/themes/classic/communicator/menubuttonBindings.xml
@@ -8,7 +8,7 @@
   <binding id="menubutton-toolbar">
     <content excludes="observes,template,menupopup">
       <xul:button class="menubutton-dual-button button-toolbar-1 top" allowevents="true" 
-                  inherits="buttontooltiptext:tooltiptext,buttonaction:oncommand,src,value,crop,accesskey,disabled"/>
+                  inherits="tooltiptext=buttontooltiptext,oncommand=buttonaction,src,value,crop,accesskey,disabled"/>
       <xul:box class="menubutton-dual-dropmarker-box" autostretch="never" valign="middle" flex="1">
         <xul:image class="menubutton-dual-dropmarker" inherits="disabled"/>
       </xul:box>
diff --git a/themes/classic/global/mac/classicBindings.xml b/themes/classic/global/mac/classicBindings.xml
index ba1bb1d71c96..9390615e7969 100644
--- a/themes/classic/global/mac/classicBindings.xml
+++ b/themes/classic/global/mac/classicBindings.xml
@@ -80,13 +80,13 @@
 
   <binding id="scrollbar">
     <content>
-      <xul:scrollbarbutton type="decrement" inherits="align:sborient">
+      <xul:scrollbarbutton type="decrement" inherits="sborient=align">
           <xul:image inherits="src"/>
 	  </xul:scrollbarbutton>
       <xul:slider flex="1" inherits="curpos,maxpos,pageincrement,increment,align">
       	<xul:thumb inherits="align,src" flex="1"/>
       </xul:slider>
-      <xul:scrollbarbutton type="increment" inherits="align:sborient">
+      <xul:scrollbarbutton type="increment" inherits="sborient=align">
       	  <xul:image inherits="src"/>
 	  </xul:scrollbarbutton>
     </content>
diff --git a/themes/classic/global/menubuttonBindings.xml b/themes/classic/global/menubuttonBindings.xml
index 46bba22eff68..439f2823f703 100644
--- a/themes/classic/global/menubuttonBindings.xml
+++ b/themes/classic/global/menubuttonBindings.xml
@@ -8,7 +8,7 @@
     <content excludes="observes,template,menupopup">
 	   <xul:box class="classic-simplebutton-box" autostretch="never" flex="1">
 	      <xul:button class="classic-simplebutton" allowevents="true" flex="1"
-                  inherits="value,src,accesskey,crop,disabled,buttonaction:oncommand" 
+                  inherits="value,src,accesskey,crop,disabled,oncommand=buttonaction" 
                   onmousedown="this.parentNode.setAttribute('buttondown','true');"
                   onmouseup="this.parentNode.removeAttribute('buttondown');"
                   onmouseover="this.parentNode.setAttribute('buttonover','true');"
diff --git a/themes/classic/global/win/classicBindings.xml b/themes/classic/global/win/classicBindings.xml
index 55767c5ea1a5..7c6f4d7ac862 100644
--- a/themes/classic/global/win/classicBindings.xml
+++ b/themes/classic/global/win/classicBindings.xml
@@ -74,11 +74,11 @@
 
   <binding id="scrollbar">
     <content>
-      <xul:scrollbarbutton type="decrement" inherits="align:sborient"/>
+      <xul:scrollbarbutton type="decrement" inherits="sborient=align"/>
       <xul:slider flex="1" inherits="curpos,maxpos,pageincrement,increment">
 	      <xul:thumb inherits="align,src" flex="1"/>
       </xul:slider>
-      <xul:scrollbarbutton type="increment" inherits="align:sborient"/>
+      <xul:scrollbarbutton type="increment" inherits="sborient=align"/>
     </content>
   </binding>
   
@@ -119,7 +119,7 @@
       </xul:box>
       <xul:spring class="menuitem-iconic-spring"/>
       <xul:text class="menu-iconic-text" flex="1" align="left" inherits="value,accesskey,crop" crop="right"/>
-      <xul:text class="menu-iconic-accel" inherits="acceltext:value"/>
+      <xul:text class="menu-iconic-accel" inherits="value=acceltext"/>
     </content>
   </binding>
 
@@ -128,8 +128,8 @@
       <xul:box class="largeheader-box" flex="1">
         <xul:box class="largeheader-text-container" orient="vertical">
           <xul:spring flex="1"/>
-          <xul:text class="largeheader-header-text" inherits="title:value" crop="right"/>
-          <xul:html class="largeheader-desc-text" inherits="description:value"/>
+          <xul:text class="largeheader-header-text" inherits="value=title" crop="right"/>
+          <xul:html class="largeheader-desc-text" inherits="value=description"/>
           <xul:spring flex="1"/>
         </xul:box>
         <xul:box class="largeheader-icon-container" autostretch="never">
@@ -173,7 +173,7 @@
 <!--  
   <binding id="throbber" extends="xul:box">
     <content autostretch="never">
-      <button allowevents="true" class="throbber-button" inherits="throbberaction:oncommand,throbbertooltip:tooltip,throbbertooltiptext:tooltiptext"/>
+      <button allowevents="true" class="throbber-button" inherits="oncommand=throbberaction,tooltip=throbbertooltip,tooltiptext=throbbertooltiptext"/>
     </content>
   </binding>
 -->
diff --git a/themes/modern/communicator/menubuttonBindings.xml b/themes/modern/communicator/menubuttonBindings.xml
index 959272a82f01..f25eb9e31ddb 100644
--- a/themes/modern/communicator/menubuttonBindings.xml
+++ b/themes/modern/communicator/menubuttonBindings.xml
@@ -9,7 +9,7 @@
     <content excludes="observes,template,menupopup">
       <xul:stack class="menubutton-dual-stack">
         <xul:button class="menubutton-dual-button button-toolbar-1 top" allowevents="true" 
-                    inherits="buttontooltiptext:tooltiptext,buttonaction:oncommand,src,value,crop,accesskey,disabled"/>
+                    inherits="tooltiptext=buttontooltiptext,oncommand=buttonaction,src,value,crop,accesskey,disabled"/>
         <xul:box class="menubutton-dual-dropmarker-box" autostretch="never" flex="1">
           <xul:image class="menubutton-dual-dropmarker" inherits="disabled"/>
         </xul:box>
@@ -21,7 +21,7 @@
     <content excludes="observes,template,menupopup">
       <xul:stack class="menubutton-dual-stack">
         <xul:button class="menubutton-dual-button button-toolbar-2 top" allowevents="true" 
-                    inherits="buttontooltiptext:tooltiptext,buttonaction:oncommand,src,value,crop,accesskey,disabled"/>
+                    inherits="tooltiptext=buttontooltiptext,oncommand=buttonaction,src,value,crop,accesskey,disabled"/>
         <xul:box class="menubutton-dual-dropmarker-box" autostretch="never" flex="1">
           <xul:image class="menubutton-dual-dropmarker" inherits="disabled"/>
         </xul:box>
diff --git a/themes/modern/global/globalBindings.xml b/themes/modern/global/globalBindings.xml
index da68c75bcb58..d5c0fa46df43 100644
--- a/themes/modern/global/globalBindings.xml
+++ b/themes/modern/global/globalBindings.xml
@@ -19,13 +19,13 @@
   </binding>
 
   <binding id="toolbar-primary" extends="chrome://global/content/toolbarBindings.xml#toolbar">
-  	<content inherits="false">
+  	<content>
   	  	<xul:box class="toolbar-primary-image-left">
-        	<xul:toolbargrippy inherits="grippytooltiptext:tooltiptext,grippytooltip:tooltip,last-toolbar"
+        	<xul:toolbargrippy inherits="tooltiptext=grippytooltiptext,tooltip=grippytooltip,last-toolbar"
            		                onclick="this.grippyClicked();" tbattr="toolbar-grippy"
             	                class="toolbar-primary-grippy"/>
     	</xul:box>	
-        <xul:box flex="1" class="toolbar-primary-image-middle toolbar-holder" inherits="collapsed,last-toolbar,tborient:orient,tbautostretch:autostretch" autostretch="never">
+        <xul:box flex="1" class="toolbar-primary-image-middle toolbar-holder" inherits="collapsed,last-toolbar,orient=tborient,autostretch=tbautostretch" autostretch="never">
         	  <children/>
         </xul:box>
         <xul:spring class="toolbar-primary-image-right"/>
diff --git a/xpfe/communicator/resources/content/dialogBindings.xml b/xpfe/communicator/resources/content/dialogBindings.xml
index d0ee0c09c9c9..58559583163b 100644
--- a/xpfe/communicator/resources/content/dialogBindings.xml
+++ b/xpfe/communicator/resources/content/dialogBindings.xml
@@ -8,9 +8,9 @@
   <binding id="smallheader">
     <content>
       <xul:box class="box-smallheader-box toolbar-primary" autostretch="never" flex="1">
-        <xul:text class="box-smallheader-left" inherits="title:value"/>
+        <xul:text class="box-smallheader-left" inherits="value=title"/>
         <xul:spring flex="1"/>
-        <xul:text class="box-smallheader-right" inherits="description:value"/>
+        <xul:text class="box-smallheader-right" inherits="value=description"/>
       </xul:box>
     </content>
     <interface>
@@ -40,7 +40,7 @@
       <xul:box class="box-status-bg toolbar-standard" flex="1">
         <xul:text class="box-status-text" inherits="value"/>
         <xul:spring flex="1"/>
-        <xul:text class="box-status-progress" inherits="progress:value"/>
+        <xul:text class="box-status-progress" inherits="value=progress"/>
       </xul:box>  
     </content>
   </binding>
diff --git a/xpfe/components/console/resources/content/consoleBindings.xml b/xpfe/components/console/resources/content/consoleBindings.xml
index 7202e1a01d79..04a22c9bb7ac 100644
--- a/xpfe/components/console/resources/content/consoleBindings.xml
+++ b/xpfe/components/console/resources/content/consoleBindings.xml
@@ -15,20 +15,20 @@
         </xul:box>
         <xul:box orient="vertical" flex="1">
           <xul:box autostretch="never" valign="top">
-            <xul:text class="label" inherits="typetext:value"/>
-            <xul:html inherits="msg:value" flex="1"/>
+            <xul:text class="label" inherits="value=typetext"/>
+            <xul:html inherits="value=msg" flex="1"/>
           </xul:box>
           <xul:box>
             <xul:text class="label" value="&url.label;"/>
-            <xul:text class="label" inherits="url:value" crop="right"/>
+            <xul:text class="label" inherits="value=url" crop="right"/>
           </xul:box>
           <xul:box>
             <xul:text class="label" value="&line.label;"/>
-            <xul:text class="label" inherits="line:value" flex="1"/>
+            <xul:text class="label" inherits="value=line" flex="1"/>
             <xul:text class="label" value="&col.label;"/>
-            <xul:text class="label" inherits="col:value" flex="1"/>
+            <xul:text class="label" inherits="value=col" flex="1"/>
           </xul:box>
-          <xul:html inherits="error:value"/>
+          <xul:html inherits="value=error"/>
         </xul:box>
       </xul:box>
     </content>
diff --git a/xpfe/global/resources/content/dialogBindings.xml b/xpfe/global/resources/content/dialogBindings.xml
index cf34641f8b05..7aafdf3c9117 100644
--- a/xpfe/global/resources/content/dialogBindings.xml
+++ b/xpfe/global/resources/content/dialogBindings.xml
@@ -8,9 +8,9 @@
   <binding id="smallheader">
     <content>
       <xul:box class="toolbar-primary" autostretch="never" flex="1">
-        <xul:text class="box-smallheader-left" inherits="title:value"/>
+        <xul:text class="box-smallheader-left" inherits="value=title"/>
         <xul:spring flex="1"/>
-        <xul:text class="box-smallheader-right" inherits="description:value"/>
+        <xul:text class="box-smallheader-right" inherits="value=description"/>
       </xul:box>
     </content>
     <implementation>
@@ -38,7 +38,7 @@
       <xul:box class="box-status-bg toolbar-standard" flex="1">
         <xul:text class="box-status-text" inherits="value"/>
         <xul:spring flex="1"/>
-        <xul:text class="box-status-progress" inherits="progress:value"/>
+        <xul:text class="box-status-progress" inherits="value=progress"/>
       </xul:box>  
     </content>
   </binding>
diff --git a/xpfe/global/resources/content/menulistBindings.xml b/xpfe/global/resources/content/menulistBindings.xml
index e90ef349d61b..b937c9fc4456 100644
--- a/xpfe/global/resources/content/menulistBindings.xml
+++ b/xpfe/global/resources/content/menulistBindings.xml
@@ -81,7 +81,7 @@
     <content excludes="template,observes,menupopup">
       <xul:box class="menubutton-internal-box">
         <xul:button class="menubutton-dual-button top" allowevents="true" 
-                    inherits="buttontooltiptext:tooltiptext,buttonaction:oncommand,src,value,crop,accesskey"/>
+                    inherits="tooltiptext=buttontooltiptext,oncommand=buttonaction,src,value,crop,accesskey"/>
         <xul:box class="menubutton-dual-dropmarker-box" autostretch="never" valign="middle">
           <xul:image class="menubutton-dropmarker"/>
         </xul:box>
@@ -93,7 +93,7 @@
     <content excludes="template,observes,menupopup">
       <xul:box class="menubutton-internal-box">
         <xul:button class="menubutton-dual-button left" allowevents="true" 
-                    inherits="buttontooltiptext:tooltiptext,buttonaction:oncommand,src,value,crop,accesskey"/>
+                    inherits="tooltiptext=buttontooltiptext,oncommand=buttonaction,src,value,crop,accesskey"/>
         <xul:box class="menubutton-dual-dropmarker-box" autostretch="never" valign="middle">
           <xul:image class="menubutton-dropmarker"/>
         </xul:box>
@@ -105,7 +105,7 @@
     <content excludes="template,observes,menupopup">
       <xul:box class="menubutton-internal-box">
         <xul:button class="menubutton-dual-button right" allowevents="true" 
-                    inherits="buttontooltiptext:tooltiptext,buttonaction:oncommand,src,value,crop,accesskey"/>
+                    inherits="tooltiptext=buttontooltiptext,oncommand=buttonaction,src,value,crop,accesskey"/>
         <xul:box class="menubutton-dual-dropmarker-box" autostretch="never" valign="middle">
           <xul:image class="menubutton-dropmarker"/>
         </xul:box>
@@ -117,7 +117,7 @@
     <content excludes="template,observes,menupopup">
       <xul:box class="menubutton-internal-box">
         <xul:button class="menubutton-dual-button bottom" allowevents="true" 
-                    inherits="buttontooltiptext:tooltiptext,buttonaction:oncommand,src,value,crop,accesskey"/>
+                    inherits="tooltiptext=buttontooltiptext,oncommand=buttonaction,src,value,crop,accesskey"/>
         <xul:box class="menubutton-dual-dropmarker-box" autostretch="never" valign="middle">
           <xul:image class="menubutton-dropmarker"/>
         </xul:box>
@@ -128,7 +128,7 @@
   <binding id="menubutton-dual-ex" extends="chrome://global/content/menulistBindings.xml#menubutton-dual-top">
     <content excludes="template,observes,menupopup">
       <xul:button class="menubutton-dual-ex-button top" allowevents="true" 
-                  inherits="buttontooltiptext:tooltiptext,buttonaction:oncommand,src,value,crop,accesskey,disabled"
+                  inherits="tooltiptext=buttontooltiptext,oncommand=buttonaction,src,value,crop,accesskey,disabled"
                   onmouseover="this.parentNode.buttonover = true;"
                   onmouseout="this.parentNode.buttonover = false;"
                   onmousedown="this.parentNode.buttondown = true;"
diff --git a/xpfe/global/resources/content/toolbarBindings.xml b/xpfe/global/resources/content/toolbarBindings.xml
index 3f84c83cb2b5..ae576377fee6 100644
--- a/xpfe/global/resources/content/toolbarBindings.xml
+++ b/xpfe/global/resources/content/toolbarBindings.xml
@@ -196,10 +196,10 @@ Contributor(s):
 
   <binding id="toolbar" extends="xul:box">
     <content>
-      <xul:toolbargrippy inherits="grippytooltiptext:tooltiptext,grippytooltip:tooltip,last-toolbar"
+      <xul:toolbargrippy inherits="tooltiptext=grippytooltiptext,tooltip=grippytooltip,last-toolbar"
                          onclick="this.grippyClicked();" tbattr="toolbar-grippy"
                          class="toolbar-grippy"/>
-      <xul:box flex="1" class="toolbar-holder" inherits="collapsed,last-toolbar,tborient:orient,tbautostretch:autostretch" autostretch="never">
+      <xul:box flex="1" class="toolbar-holder" inherits="collapsed,last-toolbar,orient=tborient,autostretch=tbautostretch" autostretch="never">
         <children/>
       </xul:box>
     </content>
@@ -226,7 +226,7 @@ Contributor(s):
 
   <binding id="menubar" extends="xul:menubar">
     <content>
-      <xul:toolbargrippy inherits="grippytooltiptext:tooltiptext,grippytooltip:tooltip,last-toolbar"
+      <xul:toolbargrippy inherits="tooltiptext=grippytooltiptext,tooltip=grippytooltip,last-toolbar"
                          onclick="this.grippyClicked();" tbattr="toolbar-grippy"
                          class="toolbar-grippy"/>
       <xul:box flex="1" class="toolbar-holder" inherits="collapsed,last-toolbar" autostretch="never">
diff --git a/xpfe/global/resources/content/xulBindings.xml b/xpfe/global/resources/content/xulBindings.xml
index 391f0b8da976..bab321bc3427 100644
--- a/xpfe/global/resources/content/xulBindings.xml
+++ b/xpfe/global/resources/content/xulBindings.xml
@@ -71,7 +71,7 @@
   <binding id="menuitem">
     <content autostretch="never" excludes="template,observes,menupopup">
       <xul:text class="menu-text" flex="1" align="left" inherits="value,accesskey,crop" crop="right"/>
-      <xul:text class="menu-accel" inherits="acceltext:value"/>
+      <xul:text class="menu-accel" inherits="value=acceltext"/>
     </content>
     <implementation>
       <property name="data" onset="this.setAttribute('data',val); return val;"
@@ -85,7 +85,7 @@
         <xul:image/>
       </xul:box>
       <xul:text class="menu-iconic-text" flex="1" align="left" inherits="value,accesskey,crop" crop="right"/>
-      <xul:text class="menu-iconic-accel" inherits="acceltext:value"/>
+      <xul:text class="menu-iconic-accel" inherits="value=acceltext"/>
     </content>
     <implementation>
       <property name="data" onset="this.setAttribute('data',val); return val;"
@@ -99,7 +99,7 @@
         <xul:image/>
       </xul:box>
       <xul:text class="menu-iconic-text" flex="1" align="left" inherits="value,accesskey,crop" crop="right"/>
-      <xul:text class="menu-iconic-accel" inherits="acceltext:value"/>
+      <xul:text class="menu-iconic-accel" inherits="value=acceltext"/>
       <xul:box orient="vertical" autostretch="never" class="menu-right" inherits="menuactive,disabled">
         <xul:image/>
       </xul:box>