Bring chat windows to front when clicked.

This commit is contained in:
Jared Goodwin 2020-02-24 18:45:35 -08:00
parent d2df890225
commit 62245979b7
6 changed files with 17 additions and 4 deletions

View File

@ -20,6 +20,12 @@ export function CreateChatWindow(deviceID, deviceName) {
chatWindow.setAttribute("id", "chat-" + deviceID);
chatWindow.innerHTML = windowHtml;
document.body.appendChild(chatWindow);
chatWindow.addEventListener("mousedown", (ev) => {
document.querySelectorAll(".chat-window").forEach(x => {
x.style.zIndex = "0";
});
ev.currentTarget.style.zIndex = "1";
});
chatWindow.querySelector(".close-button").onclick = (ev) => {
ev.preventDefault();
ev.stopPropagation();
@ -27,7 +33,6 @@ export function CreateChatWindow(deviceID, deviceName) {
};
chatWindow.querySelector(".chat-header").onmousedown = (ev) => {
ev.preventDefault();
ev.stopPropagation();
chatWindow.removeEventListener("mousemove", moveChatWindow);
chatWindow.removeEventListener("mouseup", stopMovingChatWindow);
chatWindow.removeEventListener("mouseleave", stopMovingChatWindow);

View File

@ -1 +1 @@
{"version":3,"file":"Chat.js","sourceRoot":"","sources":["Chat.ts"],"names":[],"mappings":"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"}
{"version":3,"file":"Chat.js","sourceRoot":"","sources":["Chat.ts"],"names":[],"mappings":"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"}

View File

@ -22,6 +22,13 @@ export function CreateChatWindow(deviceID: string, deviceName: string) {
chatWindow.innerHTML = windowHtml;
document.body.appendChild(chatWindow);
chatWindow.addEventListener("mousedown", (ev) => {
document.querySelectorAll(".chat-window").forEach(x => {
(x as HTMLDivElement).style.zIndex = "0";
});
(ev.currentTarget as HTMLDivElement).style.zIndex = "1";
});
(chatWindow.querySelector(".close-button") as HTMLElement).onclick = (ev) => {
ev.preventDefault();
ev.stopPropagation();
@ -30,7 +37,6 @@ export function CreateChatWindow(deviceID: string, deviceName: string) {
(chatWindow.querySelector(".chat-header") as HTMLDivElement).onmousedown = (ev) => {
ev.preventDefault();
ev.stopPropagation();
chatWindow.removeEventListener("mousemove", moveChatWindow);
chatWindow.removeEventListener("mouseup", stopMovingChatWindow);
chatWindow.removeEventListener("mouseleave", stopMovingChatWindow);

View File

@ -119,6 +119,7 @@ function keyDownOnWindow() {
if (!document.activeElement.isEqualNode(UI.ConsoleTextArea) &&
document.activeElement.tagName.toLowerCase() != "select" &&
document.activeElement.tagName.toLowerCase() != "input" &&
document.activeElement.tagName.toLowerCase() != "textarea" &&
!e.altKey &&
!e.ctrlKey) {
UI.ConsoleTextArea.focus();

File diff suppressed because one or more lines are too long

View File

@ -125,6 +125,7 @@ function keyDownOnWindow() {
if (!document.activeElement.isEqualNode(UI.ConsoleTextArea) &&
document.activeElement.tagName.toLowerCase() != "select" &&
document.activeElement.tagName.toLowerCase() != "input" &&
document.activeElement.tagName.toLowerCase() != "textarea" &&
!e.altKey &&
!e.ctrlKey) {
UI.ConsoleTextArea.focus();