diff options
| author | Andrew Dolgov <[email protected]> | 2017-01-21 21:59:17 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2017-01-21 21:59:17 +0300 |
| commit | e2e2479984b3aaadb4c0947e5ec15276e5c9a337 (patch) | |
| tree | 1662c1772cbcb6e44d017cea28e35d45de44921f /lib/dijit/form/templates/DropDownBox.html | |
| parent | ab235fc5f13385a690a1ed31ae77d0006c85197d (diff) | |
| parent | 1c4f5e83900fdd71a84f2e142c694c75106bef53 (diff) | |
Merge branch 'dojo-1.12.1'
Conflicts:
js/prefs.js
Diffstat (limited to 'lib/dijit/form/templates/DropDownBox.html')
| -rw-r--r-- | lib/dijit/form/templates/DropDownBox.html | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/dijit/form/templates/DropDownBox.html b/lib/dijit/form/templates/DropDownBox.html index eb8f3e70d..282f55978 100644 --- a/lib/dijit/form/templates/DropDownBox.html +++ b/lib/dijit/form/templates/DropDownBox.html @@ -1,8 +1,10 @@ <div class="dijit dijitReset dijitInline dijitLeft" id="widget_${id}" role="combobox" + aria-haspopup="true" + data-dojo-attach-point="_popupStateNode" ><div class='dijitReset dijitRight dijitButtonNode dijitArrowButton dijitDownArrowButton dijitArrowButtonContainer' - data-dojo-attach-point="_buttonNode, _popupStateNode" role="presentation" + data-dojo-attach-point="_buttonNode" role="presentation" ><input class="dijitReset dijitInputField dijitArrowButtonInner" value="▼ " type="text" tabIndex="-1" readonly="readonly" role="button presentation" aria-hidden="true" ${_buttonInputDisabled} /></div @@ -10,7 +12,7 @@ ><input class="dijitReset dijitInputField dijitValidationIcon dijitValidationInner" value="Χ " type="text" tabIndex="-1" readonly="readonly" role="presentation" /></div ><div class="dijitReset dijitInputField dijitInputContainer" - ><input class='dijitReset dijitInputInner' ${!nameAttrSetting} type="text" autocomplete="off" - data-dojo-attach-point="textbox,focusNode" role="textbox" aria-haspopup="true" + ><input class='dijitReset dijitInputInner' ${!nameAttrSetting} type="${type}" autocomplete="off" + data-dojo-attach-point="textbox,focusNode" role="textbox" /></div ></div> |