Bug 880918 - Allow accesskeys to work for wrapped labels, r=enndeakin
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Fri, 19 Jul 2013 17:35:09 +0200
changeset 155575 2dbad15d775e3edf0eb60bdb2ce7e4e80264889e
parent 155574 5dd57b76bc71a38ab1da17263f1a05ba532b12bb
child 155576 e4177c0221d0730145f081924a23a75731c59b98
push id25666
push userjwein@mozilla.com
push dateMon, 18 Nov 2013 15:56:58 +0000
treeherdermozilla-central@f2adb62d07eb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersenndeakin
bugs880918
milestone25.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 880918 - Allow accesskeys to work for wrapped labels, r=enndeakin
toolkit/content/widgets/toolbarbutton.xml
toolkit/content/xul.css
--- a/toolkit/content/widgets/toolbarbutton.xml
+++ b/toolkit/content/widgets/toolbarbutton.xml
@@ -81,14 +81,14 @@
     </content>
   </binding>
 
   <binding id="toolbarbutton-wrapping-label"
            extends="chrome://global/content/bindings/toolbarbutton.xml#toolbarbutton">
     <content>
       <children includes="observes|template|menupopup|panel|tooltip"/>
       <xul:image class="toolbarbutton-icon" xbl:inherits="validate,src=image,label"/>
-      <xul:label class="toolbarbutton-text" flex="1"
-                 xbl:inherits="xbl:text=label"/>
+      <xul:label class="toolbarbutton-text toolbarbutton-label" flex="1"
+                 xbl:inherits="xbl:text=label,accesskey"/>
     </content>
   </binding>
     
 </bindings>
--- a/toolkit/content/xul.css
+++ b/toolkit/content/xul.css
@@ -689,17 +689,17 @@ label {
   -moz-binding: url("chrome://global/content/bindings/text.xml#text-label");
 }
 
 label.text-link, label[onclick] {
   -moz-binding: url("chrome://global/content/bindings/text.xml#text-link");
   -moz-user-focus: normal;
 }
 
-label[control], label.radio-label, label.checkbox-label {
+label[control], label.radio-label, label.checkbox-label, label.toolbarbutton-label {
   -moz-binding: url("chrome://global/content/bindings/text.xml#label-control");
 }
 
 html|span.accesskey {
   text-decoration: underline;
 }
 
 /********** textbox **********/