Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-16 21:06:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

adjust so splithandler dialogs dont get trumped by default_in

Browse source
This commit is contained in:
Brenden Tuck 2018-11-27 20:35:53 -05:00
parent b91504110f
commit 8f15256dff
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
evennia/web/webclient/static/webclient/js/plugins/splithandler.js
View file

@ -371,12 +371,12 @@ let splithandler_plugin = (function () {
var code = event.which;
if (code === 27) { // Escape key
if ($('#splitdialogcontent').is(':visible')) {
plugins['popups'].closePopup("#splitdialogcontent");
if ($('#splitdialog').is(':visible')) {
plugins['popups'].closePopup("#splitdialog");
return true;
}
if ($('#panedialogcontent').is(':visible')) {
plugins['popups'].closePopup("#panedialogcontent");
if ($('#panedialog').is(':visible')) {
plugins['popups'].closePopup("#panedialog");
return true;
}
}

2
evennia/web/webclient/templates/webclient/base.html
View file

@ -73,10 +73,10 @@ JQuery available.
<script src={% static "webclient/js/plugins/popups.js" %} language="javascript" type="text/javascript"></script>
<script src={% static "webclient/js/plugins/options.js" %} language="javascript" type="text/javascript"></script>
<script src={% static "webclient/js/plugins/history.js" %} language="javascript" type="text/javascript"></script>
<script src={% static "webclient/js/plugins/splithandler.js" %} language="javascript" type="text/javascript"></script>
<script src={% static "webclient/js/plugins/default_in.js" %} language="javascript" type="text/javascript"></script>
<script src={% static "webclient/js/plugins/oob.js" %} language="javascript" type="text/javascript"></script>
<script src={% static "webclient/js/plugins/notifications.js" %} language="javascript" type="text/javascript"></script>
<script src={% static "webclient/js/plugins/splithandler.js" %} language="javascript" type="text/javascript"></script>
<script src={% static "webclient/js/plugins/default_out.js" %} language="javascript" type="text/javascript"></script>
{% endblock %}