Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-31 13:07:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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 3a740913ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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
closePopup("#optionsdialog");
closePopup("#helpdialog");
if ($('#helpdialog').is(':visible')) {
closePopup("#helpdialog");
} else {
closePopup("#optionsdialog");
}
}
if (history_entry !== null) {