diff options
| author | volchek2 <volchek2@illinois.edu> | 2017-11-04 00:28:59 -0500 |
|---|---|---|
| committer | volchek2 <volchek2@illinois.edu> | 2017-11-04 00:28:59 -0500 |
| commit | 31002a7e52f7360e0979d9ddf1380c55451311eb (patch) | |
| tree | 84f902e54d83f757c6052abf442e89ede5c774d0 /src/SMAPI.Web/wwwroot/Content/js/log-parser.js | |
| parent | 99278f0be19c63a32a7d5eba94d7a0cd88dd288c (diff) | |
| download | SMAPI-31002a7e52f7360e0979d9ddf1380c55451311eb.tar.gz SMAPI-31002a7e52f7360e0979d9ddf1380c55451311eb.tar.bz2 SMAPI-31002a7e52f7360e0979d9ddf1380c55451311eb.zip | |
check whether the popup is open before closing it with esc
Diffstat (limited to 'src/SMAPI.Web/wwwroot/Content/js/log-parser.js')
| -rw-r--r-- | src/SMAPI.Web/wwwroot/Content/js/log-parser.js | 5 |
1 files changed, 4 insertions, 1 deletions
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); } }); |