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/templates/InlineEditBox.html | |
| parent | ab235fc5f13385a690a1ed31ae77d0006c85197d (diff) | |
| parent | 1c4f5e83900fdd71a84f2e142c694c75106bef53 (diff) | |
Merge branch 'dojo-1.12.1'
Conflicts:
js/prefs.js
Diffstat (limited to 'lib/dijit/templates/InlineEditBox.html')
| -rw-r--r-- | lib/dijit/templates/InlineEditBox.html | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/dijit/templates/InlineEditBox.html b/lib/dijit/templates/InlineEditBox.html index d6c7096dc..6aac77ee1 100644 --- a/lib/dijit/templates/InlineEditBox.html +++ b/lib/dijit/templates/InlineEditBox.html @@ -1,10 +1,9 @@ <span data-dojo-attach-point="editNode" role="presentation" class="dijitReset dijitInline dijitOffScreen" - data-dojo-attach-event="onkeypress: _onKeyPress" ><span data-dojo-attach-point="editorPlaceholder"></span ><span data-dojo-attach-point="buttonContainer" - ><button data-dojo-type="dijit/form/Button" data-dojo-props="label: '${buttonSave}', 'class': 'saveButton'" + ><button data-dojo-type="./form/Button" data-dojo-props="label: '${buttonSave}', 'class': 'saveButton'" data-dojo-attach-point="saveButton" data-dojo-attach-event="onClick:save"></button - ><button data-dojo-type="dijit/form/Button" data-dojo-props="label: '${buttonCancel}', 'class': 'cancelButton'" + ><button data-dojo-type="./form/Button" data-dojo-props="label: '${buttonCancel}', 'class': 'cancelButton'" data-dojo-attach-point="cancelButton" data-dojo-attach-event="onClick:cancel"></button ></span ></span> |