From 8f15256dffca32d6987ed75e55d11e9d8244a2e9 Mon Sep 17 00:00:00 2001
From: Brenden Tuck <friarzen@gmail.com>
Date: Tue, 27 Nov 2018 20:35:53 -0500
Subject: [PATCH] adjust so splithandler dialogs dont get trumped by default_in

---
 .../webclient/static/webclient/js/plugins/splithandler.js | 8 ++++----
 evennia/web/webclient/templates/webclient/base.html       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/evennia/web/webclient/static/webclient/js/plugins/splithandler.js b/evennia/web/webclient/static/webclient/js/plugins/splithandler.js
index c32cf32c1b..284d74b912 100644
--- a/evennia/web/webclient/static/webclient/js/plugins/splithandler.js
+++ b/evennia/web/webclient/static/webclient/js/plugins/splithandler.js
@@ -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;
             }
         }
diff --git a/evennia/web/webclient/templates/webclient/base.html b/evennia/web/webclient/templates/webclient/base.html
index 176ef0d160..0cc4302af4 100644
--- a/evennia/web/webclient/templates/webclient/base.html
+++ b/evennia/web/webclient/templates/webclient/base.html
@@ -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 %}