Merge remote-tracking branch 'origin/chat' into chat

# Conflicts:
#	gui/preload-chat.js
#	gui/src/chat-module.html
This commit is contained in:
DJ2LS 2023-03-22 23:50:00 +01:00
commit 104b3d31d9
2 changed files with 628 additions and 623 deletions

View file

@ -1875,11 +1875,9 @@ async function updateAllChat(clear) {
})
.then(async function (result) {
// handle result async
//document.getElementById("blurOverlay").classList.add("bg-primary");
document.getElementById("blurOverlay").style.webkitFilter = "blur(10px)";
//document.getElementById("blurOverlay").classList.add("bg-primary");
document.getElementById("blurOverlay").style.webkitFilter =
"blur(10px)";
if (typeof result !== "undefined") {
for (const item of result.docs) {
@ -1894,11 +1892,13 @@ async function updateAllChat(clear) {
}
}
}
)
document.getElementById("blurOverlay").style.webkitFilter =
"blur(0px)";
})
.catch(function (err) {
console.log(err);
document.getElementById("blurOverlay").style.webkitFilter =
"blur(0px)";
});
})
.catch(function (err) {

File diff suppressed because it is too large Load diff