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/ComboButton.html | |
parent | ab235fc5f13385a690a1ed31ae77d0006c85197d (diff) | |
parent | 1c4f5e83900fdd71a84f2e142c694c75106bef53 (diff) |
Merge branch 'dojo-1.12.1'
Conflicts:
js/prefs.js
Diffstat (limited to 'lib/dijit/form/templates/ComboButton.html')
-rw-r--r-- | lib/dijit/form/templates/ComboButton.html | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/dijit/form/templates/ComboButton.html b/lib/dijit/form/templates/ComboButton.html index 1ffe2ec89..51d5746e3 100644 --- a/lib/dijit/form/templates/ComboButton.html +++ b/lib/dijit/form/templates/ComboButton.html @@ -1,7 +1,7 @@ <table class="dijit dijitReset dijitInline dijitLeft" cellspacing='0' cellpadding='0' role="presentation" ><tbody role="presentation"><tr role="presentation" - ><td class="dijitReset dijitStretch dijitButtonNode" data-dojo-attach-point="buttonNode" data-dojo-attach-event="ondijitclick:_onClick,onkeypress:_onButtonKeyPress" + ><td class="dijitReset dijitStretch dijitButtonNode" data-dojo-attach-point="buttonNode" data-dojo-attach-event="ondijitclick:__onClick,onkeydown:_onButtonKeyDown" ><div id="${id}_button" class="dijitReset dijitButtonContents" data-dojo-attach-point="titleNode" role="button" aria-labelledby="${id}_label" @@ -11,13 +11,14 @@ ></td ><td id="${id}_arrow" class='dijitReset dijitRight dijitButtonNode dijitArrowButton' data-dojo-attach-point="_popupStateNode,focusNode,_buttonNode" - data-dojo-attach-event="onkeypress:_onArrowKeyPress" + data-dojo-attach-event="onkeydown:_onArrowKeyDown" title="${optionsTitle}" role="button" aria-haspopup="true" ><div class="dijitReset dijitArrowButtonInner" role="presentation"></div ><div class="dijitReset dijitArrowButtonChar" role="presentation">▼</div ></td ><td style="display:none !important;" - ><input ${!nameAttrSetting} type="${type}" value="${value}" data-dojo-attach-point="valueNode" role="presentation" + ><input ${!nameAttrSetting} type="${type}" value="${value}" data-dojo-attach-point="valueNode" + class="dijitOffScreen" aria-hidden="true" data-dojo-attach-event="onclick:_onClick" /></td></tr></tbody ></table> |