GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2025-12-12 09:10:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

proper handling of dont-hide-menu

Browse Source
This commit is contained in:
Devaev Maxim 2020-09-23 18:45:19 +03:00
parent 2178d22fec
commit bbf3b18fe3
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
web/share/js/wm.js
View File

@ -84,6 +84,8 @@ function __WindowManager() {
self.confirm = (...args) => __modalDialog("Question", args.join(" "), true, true); self.confirm = (...args) => __modalDialog("Question", args.join(" "), true, true);
var __modalDialog = function(header, text, ok, cancel) { var __modalDialog = function(header, text, ok, cancel) {
let el_active_menu = (document.activeElement && document.activeElement.closest(".menu"));
let el_modal = document.createElement("div"); let el_modal = document.createElement("div");
el_modal.className = "modal"; el_modal.className = "modal";
el_modal.style.visibility = "visible"; el_modal.style.visibility = "visible";
@ -117,7 +119,11 @@ function __WindowManager() {
if (index !== -1) { if (index !== -1) {
__windows.splice(index, 1); __windows.splice(index, 1);
} }
__activateLastWindow(el_modal); if (el_active_menu && el_active_menu.style.visibility === "visible") {
el_active_menu.focus();
} else {
__activateLastWindow(el_modal);
}
resolve(retval); resolve(retval);
} }
@ -288,7 +294,7 @@ function __WindowManager() {
}; };
var __globalMouseButtonHandler = function(event) { var __globalMouseButtonHandler = function(event) {
if (!event.target.matches(".menu-button")) { if (!event.target.matches(".menu-button") && !event.target.closest(".modal")) {
for (let el_item = event.target; el_item && el_item !== document; el_item = el_item.parentNode) { for (let el_item = event.target; el_item && el_item !== document; el_item = el_item.parentNode) {
if (el_item.hasAttribute("data-force-hide-menu")) { if (el_item.hasAttribute("data-force-hide-menu")) {
break; break;