Changeset 12555

Timestamp:

02/20/08 07:31:19 (10 months ago)

Author:

becky

Message:

refs #5525 move the autocomplete and haspopup role to the textbox from the combobox. Change popup items from div to ul and li elements.

Location:

dijit/trunk/form

Files:

• ComboBox.js (modified) (4 diffs)
• templates/ComboBox.html (modified) (2 diffs)

dijit/trunk/form/ComboBox.js

@@ -554 +554 @@
                 _startSearch: function(/*String*/ key){
                         if(!this._popupWidget){
+                                var popupId = dojo.attr(this.domNode, "id") + "_popup";
                                 this._popupWidget = new dijit.form._ComboBoxMenu({
-                                        onChange: dojo.hitch(this, this._selectOption)
+                                        onChange: dojo.hitch(this, this._selectOption),
+                                        id:popupId
                                 });
+                                dijit.setWaiState(this.textbox,"controls",popupId); // associate popup with textbox
                         }
                         // create a new query to prevent accidentally querying for a hidden
@@ -661 +664 @@
                                 var cn=this.comboNode;
                                 dijit.setWaiState(cn, "labelledby", label[0].id);
-                                dijit.setWaiState(cn, "autocomplete", "list"); // FYI: different meaning that autocomplete property of combobox
                                 dijit.setWaiState(cn, "disabled", this.disabled);
                                 
@@ -700 +702 @@
                 //              Focus-less div based menu for internal use in ComboBox
 
-                templateString: "<div class='dijitMenu' dojoAttachEvent='onmousedown,onmouseup,onmouseover,onmouseout' tabIndex='-1' style='overflow:\"auto\";'>"
-                                +"<div class='dijitMenuItem dijitMenuPreviousButton' dojoAttachPoint='previousButton'></div>"
-                                +"<div class='dijitMenuItem dijitMenuNextButton' dojoAttachPoint='nextButton'></div>"
-                        +"</div>",
+                templateString: "<ul class='dijitMenu' dojoAttachEvent='onmousedown,onmouseup,onmouseover,onmouseout' tabIndex='-1' style='overflow:\"auto\";'>"
+                                +"<li class='dijitMenuItem dijitMenuPreviousButton' dojoAttachPoint='previousButton'></li>"
+                                +"<li class='dijitMenuItem dijitMenuNextButton' dojoAttachPoint='nextButton'></li>"
+                        +"</ul>",
                 _messages: null,
 
@@ -737 +739 @@
 
                         var labelObject = labelFunc(item);
-                        var menuitem = dojo.doc.createElement("div");
+                        var menuitem = dojo.doc.createElement("li");
                         if(labelObject.html){
                                 menuitem.innerHTML = labelObject.label;

dijit/trunk/form/templates/ComboBox.html

@@ -1 +1 @@
 <div class="dijit dijitReset dijitInlineTable dijitLeft"
         id="widget_${id}"
-        dojoAttachEvent="onmouseenter:_onMouse,onmouseleave:_onMouse,onmousedown:_onMouse" dojoAttachPoint="comboNode" waiRole="combobox" waiState="haspopup-true" tabIndex="-1"
+        dojoAttachEvent="onmouseenter:_onMouse,onmouseleave:_onMouse,onmousedown:_onMouse" dojoAttachPoint="comboNode" waiRole="combobox" tabIndex="-1"
         ><div style="overflow:hidden;"
                 ><div class='dijitReset dijitRight dijitButtonNode dijitArrowButton dijitDownArrowButton'
@@ -14 +14 @@
                         ><input type="text" autocomplete="off" name="${name}" class='dijitReset'
                         dojoAttachEvent="onkeypress, onkeyup, onfocus, compositionend"
-                        dojoAttachPoint="textbox,focusNode" waiRole="textbox"
+                        dojoAttachPoint="textbox,focusNode" waiRole="textbox" waiState="haspopup-true,autocomplete-list"
                 /></div
         ></div