Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into develop

Browse source
This commit is contained in:
Griatch 2017-12-31 13:42:59 +01:00
commit c18c0fc479
5 changed files with 48 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
evennia/web/webclient/static/webclient/js/webclient_gui.js
View file

@ -175,8 +175,11 @@ function onKeydown (event) {
}
if (code === 27) { // Escape key
closePopup("#optionsdialog");
closePopup("#helpdialog");
if ($('#helpdialog').is(':visible')) {
closePopup("#helpdialog");
} else {
closePopup("#optionsdialog");
}
}
if (history_entry !== null) {