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

Merge pull request #1532 from chainsol/fix_1531

Browse source 
Step through help and option popup when closing, fixes #1531
This commit is contained in:
Griatch 2017-12-14 08:20:54 +01:00 • committed by GitHub
commit ab57d2da21
1 changed files with 5 additions and 2 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 if (code === 27) { // Escape key
closePopup("#optionsdialog"); if ($('#helpdialog').is(':visible')) {
closePopup("#helpdialog"); closePopup("#helpdialog");
} else {
closePopup("#optionsdialog");
}
} }
if (history_entry !== null) { if (history_entry !== null) {