Merge pull request #13480 from AUTOMATIC1111/popup-fix

Fix accidentally closing popup dialogs
This commit is contained in:
AUTOMATIC1111 2023-10-03 12:37:46 +03:00 committed by GitHub
commit c4ffeb857e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 10 deletions

View File

@ -222,27 +222,24 @@ function extraNetworksSearchButton(tabs_id, event) {
var globalPopup = null; var globalPopup = null;
var globalPopupInner = null; var globalPopupInner = null;
function closePopup() { function closePopup() {
if (!globalPopup) return; if (!globalPopup) return;
globalPopup.style.display = "none"; globalPopup.style.display = "none";
} }
function popup(contents) { function popup(contents) {
if (!globalPopup) { if (!globalPopup) {
globalPopup = document.createElement('div'); globalPopup = document.createElement('div');
globalPopup.onclick = closePopup;
globalPopup.classList.add('global-popup'); globalPopup.classList.add('global-popup');
var close = document.createElement('div'); var close = document.createElement('div');
close.classList.add('global-popup-close'); close.classList.add('global-popup-close');
close.onclick = closePopup; close.addEventListener("click", closePopup);
close.title = "Close"; close.title = "Close";
globalPopup.appendChild(close); globalPopup.appendChild(close);
globalPopupInner = document.createElement('div'); globalPopupInner = document.createElement('div');
globalPopupInner.onclick = function(event) {
event.stopPropagation(); return false;
};
globalPopupInner.classList.add('global-popup-inner'); globalPopupInner.classList.add('global-popup-inner');
globalPopup.appendChild(globalPopupInner); globalPopup.appendChild(globalPopupInner);

View File

@ -585,7 +585,6 @@ table.popup-table .link{
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow: auto; overflow: auto;
background-color: rgba(20, 20, 20, 0.95);
} }
.global-popup *{ .global-popup *{
@ -594,9 +593,6 @@ table.popup-table .link{
.global-popup-close:before { .global-popup-close:before {
content: "×"; content: "×";
}
.global-popup-close{
position: fixed; position: fixed;
right: 0.25em; right: 0.25em;
top: 0; top: 0;
@ -605,10 +601,20 @@ table.popup-table .link{
font-size: 32pt; font-size: 32pt;
} }
.global-popup-close{
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100%;
background-color: rgba(20, 20, 20, 0.95);
}
.global-popup-inner{ .global-popup-inner{
display: inline-block; display: inline-block;
margin: auto; margin: auto;
padding: 2em; padding: 2em;
z-index: 1001;
} }
/* fullpage image viewer */ /* fullpage image viewer */