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/Dialog.html | |
| parent | ab235fc5f13385a690a1ed31ae77d0006c85197d (diff) | |
| parent | 1c4f5e83900fdd71a84f2e142c694c75106bef53 (diff) | |
Merge branch 'dojo-1.12.1'
Conflicts:
js/prefs.js
Diffstat (limited to 'lib/dijit/templates/Dialog.html')
| -rw-r--r-- | lib/dijit/templates/Dialog.html | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/dijit/templates/Dialog.html b/lib/dijit/templates/Dialog.html index 0de2225ab..fbebe4c21 100644 --- a/lib/dijit/templates/Dialog.html +++ b/lib/dijit/templates/Dialog.html @@ -2,9 +2,11 @@ <div data-dojo-attach-point="titleBar" class="dijitDialogTitleBar"> <span data-dojo-attach-point="titleNode" class="dijitDialogTitle" id="${id}_title" role="heading" level="1"></span> - <span data-dojo-attach-point="closeButtonNode" class="dijitDialogCloseIcon" data-dojo-attach-event="ondijitclick: onCancel" title="${buttonCancel}" role="button" tabIndex="-1"> + <span data-dojo-attach-point="closeButtonNode" class="dijitDialogCloseIcon" data-dojo-attach-event="ondijitclick: onCancel" title="${buttonCancel}" role="button" tabindex="-1"> <span data-dojo-attach-point="closeText" class="closeText" title="${buttonCancel}">x</span> </span> </div> <div data-dojo-attach-point="containerNode" class="dijitDialogPaneContent"></div> + ${!actionBarTemplate} </div> + |