From 33c6978d27e80a93e5cc5d8ac3f27a593f2df0e4 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Tue, 28 Jul 2020 16:49:47 +0300
Subject: [PATCH] Fix keydown events after closing window

---
 apps/common/main/lib/component/Window.js | 4 ++--
 apps/common/main/lib/util/Shortcuts.js   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/common/main/lib/component/Window.js b/apps/common/main/lib/component/Window.js
index 063bed7bf..e9dd88e61 100644
--- a/apps/common/main/lib/component/Window.js
+++ b/apps/common/main/lib/component/Window.js
@@ -803,7 +803,7 @@ define([
                         }
                     }
 
-                    Common.NotificationCenter.trigger('modal:close', this);
+                    Common.NotificationCenter.trigger('modal:close', this, hide_mask);
                 }
 
                 this.$window.remove();
@@ -843,7 +843,7 @@ define([
                                 }
                             }
                         }
-                        Common.NotificationCenter.trigger('modal:hide', this);
+                        Common.NotificationCenter.trigger('modal:hide', this, hide_mask);
                     }
                     this.$window.hide();
                     this.$window.removeClass('notransform');
diff --git a/apps/common/main/lib/util/Shortcuts.js b/apps/common/main/lib/util/Shortcuts.js
index 430646a83..f34ae1ce5 100644
--- a/apps/common/main/lib/util/Shortcuts.js
+++ b/apps/common/main/lib/util/Shortcuts.js
@@ -99,11 +99,11 @@ Common.util = Common.util||{};
                 'modal:show': function(e){
                     window.key.suspend();
                 },
-                'modal:close': function(e) {
-                    window.key.resume();
+                'modal:close': function(e, last) {
+                    last && window.key.resume();
                 },
-                'modal:hide': function(e) {
-                    window.key.resume();
+                'modal:hide': function(e, last) {
+                    last && window.key.resume();
                 }
             });
         },