From a3837d55bf10d5bde225303e53a22106d15a30ef Mon Sep 17 00:00:00 2001 From: Arsen Mirzaev Tatyano-Muradovich Date: Thu, 21 Dec 2023 01:01:14 +0700 Subject: [PATCH] =?UTF-8?q?=D0=BD=D1=83=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80?= =?UTF-8?q?=D1=8C=20=D1=82=D0=BE=D1=87=D0=BD=D0=BE=20=D1=84=D0=B8=D0=BA?= =?UTF-8?q?=D1=81=20=D1=81=D1=82=D1=80=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebala/system/public/js/administrators.js | 5 +- mirzaev/ebala/system/public/js/chat.js | 10 ++- mirzaev/ebala/system/public/js/markets.js | 10 ++- mirzaev/ebala/system/public/js/operators.js | 5 +- mirzaev/ebala/system/public/js/tasks.js | 70 +++++++++++++++---- mirzaev/ebala/system/public/js/workers.js | 10 ++- 6 files changed, 88 insertions(+), 22 deletions(-) diff --git a/mirzaev/ebala/system/public/js/administrators.js b/mirzaev/ebala/system/public/js/administrators.js index 0d06bd8..443996c 100644 --- a/mirzaev/ebala/system/public/js/administrators.js +++ b/mirzaev/ebala/system/public/js/administrators.js @@ -254,7 +254,10 @@ if (typeof window.administrators !== "function") { // row.classList.add(...buffer); // Копирование статуса активной строки - if (typeof selected === "string" && selected === "true") { + if ( + typeof selected === "string" && selected === "true" && + document.body.contains(document.getElementById("popup")) + ) { row.setAttribute("data-selected", "true"); } } diff --git a/mirzaev/ebala/system/public/js/chat.js b/mirzaev/ebala/system/public/js/chat.js index 18b5775..585095e 100644 --- a/mirzaev/ebala/system/public/js/chat.js +++ b/mirzaev/ebala/system/public/js/chat.js @@ -704,7 +704,10 @@ if (typeof window.chat !== "function") { // row.classList.add(...buffer); // Копирование статуса активной строки - if (typeof selected === "string" && selected === "true") row.setAttribute("data-selected", "true"); + if ( + typeof selected === "string" && selected === "true" && + document.body.contains(document.getElementById("popup")) + ) row.setAttribute("data-selected", "true"); } // Деинициализация устаревшего интервала обновления чата @@ -841,7 +844,10 @@ if (typeof window.chat !== "function") { // row.classList.add(...buffer); // Копирование статуса активной строки - if (typeof selected === "string" && selected === "true") row.setAttribute("data-selected", "true"); + if ( + typeof selected === "string" && selected === "true" && + document.body.contains(document.getElementById("popup")) + ) row.setAttribute("data-selected", "true"); } } }); diff --git a/mirzaev/ebala/system/public/js/markets.js b/mirzaev/ebala/system/public/js/markets.js index 03b25f1..3759c60 100644 --- a/mirzaev/ebala/system/public/js/markets.js +++ b/mirzaev/ebala/system/public/js/markets.js @@ -1668,7 +1668,10 @@ if (typeof window.markets !== "function") { // row.classList.add(...buffer); // Копирование статуса активной строки - if (typeof selected === "string" && selected === "true") { + if ( + typeof selected === "string" && selected === "true" && + document.body.contains(document.getElementById("popup")) + ) { row.setAttribute("data-selected", "true"); } } @@ -2496,7 +2499,10 @@ if (typeof window.markets !== "function") { // row.classList.add(...buffer); // Копирование статуса активной строки - if (typeof selected === "string" && selected === "true") { + if ( + typeof selected === "string" && selected === "true" && + document.body.contains(document.getElementById("popup")) + ) { row.setAttribute("data-selected", "true"); } } diff --git a/mirzaev/ebala/system/public/js/operators.js b/mirzaev/ebala/system/public/js/operators.js index ac5103a..fadc406 100644 --- a/mirzaev/ebala/system/public/js/operators.js +++ b/mirzaev/ebala/system/public/js/operators.js @@ -254,7 +254,10 @@ if (typeof window.operators !== "function") { // row.classList.add(...buffer); // Копирование статуса активной строки - if (typeof selected === "string" && selected === "true") { + if ( + typeof selected === "string" && selected === "true" && + document.body.contains(document.getElementById("popup")) + ) { row.setAttribute("data-selected", "true"); } } diff --git a/mirzaev/ebala/system/public/js/tasks.js b/mirzaev/ebala/system/public/js/tasks.js index 0a18e49..685a21b 100755 --- a/mirzaev/ebala/system/public/js/tasks.js +++ b/mirzaev/ebala/system/public/js/tasks.js @@ -1696,7 +1696,10 @@ if (typeof window.tasks !== "function") { // row.classList.add(...buffer); // Копирование статуса активной строки - if (typeof selected === "string" && selected === "true") { + if ( + typeof selected === "string" && selected === "true" && + document.body.contains(document.getElementById("popup")) + ) { row.setAttribute("data-selected", "true"); } @@ -2146,7 +2149,10 @@ if (typeof window.tasks !== "function") { // row.classList.add(...buffer); // Копирование статуса активной строки - if (typeof selected === "string" && selected === "true") { + if ( + typeof selected === "string" && selected === "true" && + document.body.contains(document.getElementById("popup")) + ) { row.setAttribute("data-selected", "true"); } @@ -2303,7 +2309,10 @@ if (typeof window.tasks !== "function") { // row.classList.add(...buffer); // Копирование статуса активной строки - if (typeof selected === "string" && selected === "true") { + if ( + typeof selected === "string" && selected === "true" && + document.body.contains(document.getElementById("popup")) + ) { row.setAttribute("data-selected", "true"); } @@ -2388,7 +2397,10 @@ if (typeof window.tasks !== "function") { // row.classList.add(...buffer); // Копирование статуса активной строки - if (typeof selected === "string" && selected === "true") { + if ( + typeof selected === "string" && selected === "true" && + document.body.contains(document.getElementById("popup")) + ) { row.setAttribute("data-selected", "true"); } @@ -2628,7 +2640,10 @@ if (typeof window.tasks !== "function") { // row.classList.add(...buffer); // Копирование статуса активной строки - if (typeof selected === "string" && selected === "true") { + if ( + typeof selected === "string" && selected === "true" && + document.body.contains(document.getElementById("popup")) + ) { row.setAttribute("data-selected", "true"); } } @@ -2740,7 +2755,10 @@ if (typeof window.tasks !== "function") { // row.classList.add(...buffer); // Копирование статуса активной строки - if (typeof selected === "string" && selected === "true") { + if ( + typeof selected === "string" && selected === "true" && + document.body.contains(document.getElementById("popup")) + ) { row.setAttribute("data-selected", "true"); } @@ -3793,7 +3811,10 @@ if (typeof window.tasks !== "function") { // row.classList.add(...buffer); // Копирование статуса активной строки - if (typeof selected === "string" && selected === "true") { + if ( + typeof selected === "string" && selected === "true" && + document.body.contains(document.getElementById("popup")) + ) { row.setAttribute("data-selected", "true"); } } @@ -3893,7 +3914,10 @@ if (typeof window.tasks !== "function") { // row.classList.add(...buffer); // Копирование статуса активной строки - if (typeof selected === "string" && selected === "true") { + if ( + typeof selected === "string" && selected === "true" && + document.body.contains(document.getElementById("popup")) + ) { row.setAttribute("data-selected", "true"); } } @@ -3996,7 +4020,10 @@ if (typeof window.tasks !== "function") { row.classList.add("published"); // Копирование статуса активной строки - if (typeof selected === "string" && selected === "true") { + if ( + typeof selected === "string" && selected === "true" && + document.body.contains(document.getElementById("popup")) + ) { row.setAttribute("data-selected", "true"); } @@ -4116,7 +4143,10 @@ if (typeof window.tasks !== "function") { // row.classList.remove("published"); // Копирование статуса активной строки - if (typeof selected === "string" && selected === "true") { + if ( + typeof selected === "string" && selected === "true" && + document.body.contains(document.getElementById("popup")) + ) { row.setAttribute("data-selected", "true"); } @@ -4936,7 +4966,10 @@ if (typeof window.tasks !== "function") { // row.classList.add(...buffer); // Копирование статуса активной строки - if (typeof selected === "string" && selected === "true") { + if ( + typeof selected === "string" && selected === "true" && + document.body.contains(document.getElementById("popup")) + ) { row.setAttribute("data-selected", "true"); } } @@ -5036,7 +5069,10 @@ if (typeof window.tasks !== "function") { // row.classList.add(...buffer); // Копирование статуса активной строки - if (typeof selected === "string" && selected === "true") { + if ( + typeof selected === "string" && selected === "true" && + document.body.contains(document.getElementById("popup")) + ) { row.setAttribute("data-selected", "true"); } } @@ -5417,7 +5453,10 @@ if (typeof window.tasks !== "function") { // row.classList.add(...buffer); // Копирование статуса активной строки - if (typeof selected === "string" && selected === "true") { + if ( + typeof selected === "string" && selected === "true" && + document.body.contains(document.getElementById("popup")) + ) { row.setAttribute("data-selected", "true"); } } else { @@ -5512,7 +5551,10 @@ if (typeof window.tasks !== "function") { // Копирование статуса активной строки if ( - typeof selected === "string" && selected === "true" + typeof selected === "string" && selected === "true" && + document.body.contains( + document.getElementById("popup"), + ) ) row.setAttribute("data-selected", "true"); // Если непрочитанных сообщений стало больше, то проиграть звук уведомления diff --git a/mirzaev/ebala/system/public/js/workers.js b/mirzaev/ebala/system/public/js/workers.js index 222fe99..a43048c 100644 --- a/mirzaev/ebala/system/public/js/workers.js +++ b/mirzaev/ebala/system/public/js/workers.js @@ -2053,7 +2053,10 @@ if (typeof window.workers !== "function") { // row.classList.add(...buffer); // Копирование статуса активной строки - if (typeof selected === "string" && selected === "true") { + if ( + typeof selected === "string" && selected === "true" && + document.body.contains(document.getElementById("popup")) + ) { row.setAttribute("data-selected", "true"); } } @@ -3385,7 +3388,10 @@ if (typeof window.workers !== "function") { // row.classList.add(...buffer); // Копирование статуса активной строки - if (typeof selected === "string" && selected === "true") { + if ( + typeof selected === "string" && selected === "true" && + document.body.contains(document.getElementById("popup")) + ) { row.setAttribute("data-selected", "true"); } }