From 31002a7e52f7360e0979d9ddf1380c55451311eb Mon Sep 17 00:00:00 2001
From: volchek2 <volchek2@illinois.edu>
Date: Sat, 4 Nov 2017 00:28:59 -0500
Subject: check whether the popup is open before closing it with esc

---
 src/SMAPI.Web/wwwroot/Content/js/log-parser.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/SMAPI.Web/wwwroot')

diff --git a/src/SMAPI.Web/wwwroot/Content/js/log-parser.js b/src/SMAPI.Web/wwwroot/Content/js/log-parser.js
index c6073f31..19287c24 100644
--- a/src/SMAPI.Web/wwwroot/Content/js/log-parser.js
+++ b/src/SMAPI.Web/wwwroot/Content/js/log-parser.js
@@ -106,7 +106,10 @@ smapi.logParser = function(sectionUrl, pasteID) {
 
     $(document).on("keydown", function (e) {
         if (e.which == 27) {
-            closeUploadPopUp();
+            if ($("#popup-upload").css("display") !== "none" && $("#popup-upload").css("opacity") == 1) {
+                closeUploadPopUp();
+            }
+
             $("#popup-raw").fadeOut(400);
         }
     });
-- 
cgit