From 822e62c238f5cfe862d4580056681b21707efd8a Mon Sep 17 00:00:00 2001 From: Murtuza Zabuawala Date: Fri, 14 Jul 2017 12:45:09 +0100 Subject: [PATCH] Fix privileges control on IE 10/11. Fixes #1166 --- .../server_groups/servers/static/js/privilege.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/web/pgadmin/browser/server_groups/servers/static/js/privilege.js b/web/pgadmin/browser/server_groups/servers/static/js/privilege.js index e89fdbfa4..654884c5d 100644 --- a/web/pgadmin/browser/server_groups/servers/static/js/privilege.js +++ b/web/pgadmin/browser/server_groups/servers/static/js/privilege.js @@ -627,7 +627,16 @@ * focused active element. */ setTimeout(function() { - if (self.$el[0] != document.activeElement && !isDescendant(self.$el[0], document.activeElement)){ + /* + Do not close the control if user clicks outside dialog window, + only close the row if user clicks on add button or on another row, if user + clicks somewhere else then we will get tagName as 'BODY' or 'WINDOW' + */ + var is_active_element = document.activeElement.tagName == 'DIV' || + document.activeElement.tagName == 'BUTTON'; + + if (is_active_element && self.$el[0] != document.activeElement && + !isDescendant(self.$el[0], document.activeElement)) { var m = self.model; m.trigger('backgrid:edited', m, self.column, new Backgrid.Command(ev)); }},10);