Changeset 14510

Timestamp:

07/18/08 11:04:30 (4 months ago)

Author:

becky

Message:

fixes #7185 If a title attribute has been provided on a button, do not set the label as the title when showLabel=false. This does not affect the screen reader since it does not speak the title it speaks the label. The label is provided to the screen reader via the ARIA labelledby property which points to the node with the label text.

Location:

dijit/trunk

Files:

• form/Button.js (modified) (2 diffs)
• tests/form/test_Button.html (modified) (1 diff)

dijit/trunk/form/Button.js

@@ -68 +68 @@
                 //      get label and set as title on button icon if necessary
                 if (this.showLabel == false){
-                        var labelText = "";
                         this.label = this.containerNode.innerHTML;
-                        labelText = dojo.trim(this.containerNode.innerText || this.containerNode.textContent || '');
-                        // set title attrib on iconNode
-                        this.titleNode.title=labelText;
+                        // if no title provided, set title attrib on iconNode
+                        if(!dojo.attr(this.domNode, "title")){
+                                this.titleNode.title=dojo.trim(this.containerNode.innerText || this.containerNode.textContent || '');
+                        }
                         dojo.addClass(this.containerNode,"dijitDisplayNone");
                 }
@@ -93 +93 @@
                 this.containerNode.innerHTML = this.label = content;
                 this._layoutHack();
-                if (this.showLabel == false){
+                if (this.showLabel == false && !(dojo.attr(this.domNode, "title"))){
                         this.titleNode.title=dojo.trim(this.containerNode.innerText || this.containerNode.textContent || '');
                 }

dijit/trunk/tests/form/test_Button.html

@@ -98 +98 @@
         <br clear="all">
         <h2>Buttons with no text label</h2>
-        <p>Buttons have showLabel=false so text is not displayed.  Should have title attribute displayed on mouse over</p>
-        <div class="box">
-                <button id="1466" dojoType="dijit.form.Button" onClick='console.log("clicked simple button with no text label")' 
+        <p>Buttons have showLabel=false so text is not displayed.  If no title attribute supplied, Should have label as title attribute displayed on mouse over</p>
+        <div class="box">
+                <button id="1466" dojoType="dijit.form.Button" title="title attrib rather than label" onClick='console.log("clicked simple button with no text label")' 
                 iconClass="plusIcon" showLabel="false">
                 <span><b>Rich</b><i> Text</i> Test!</span>