From ed50fd7e612c8cad8805cd04c3521d6d31365bf2 Mon Sep 17 00:00:00 2001 From: Arsen Mirzaev Tatyano-Muradovich Date: Thu, 21 Dec 2023 20:31:22 +0700 Subject: [PATCH] =?UTF-8?q?=D0=B2=D0=BE=D1=82=20=D1=82=D0=B5=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D1=8C=20100%=20=D0=B1=D0=B0=D0=B3=D1=84=D0=B8=D0=BA?= =?UTF-8?q?=D1=81=20=D1=8F=D0=BA=D0=BE=D1=80=D1=8C=20=D0=BC=D0=BD=D0=B5=20?= =?UTF-8?q?=D0=B2=20=D0=B6=D0=BE=D0=BF=D1=83?= 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 | 12 ++- mirzaev/ebala/system/public/js/markets.js | 10 ++- mirzaev/ebala/system/public/js/operators.js | 5 +- mirzaev/ebala/system/public/js/tasks.js | 79 ++++++++++++++++--- mirzaev/ebala/system/public/js/workers.js | 10 ++- 6 files changed, 100 insertions(+), 21 deletions(-) diff --git a/mirzaev/ebala/system/public/js/administrators.js b/mirzaev/ebala/system/public/js/administrators.js index 443996c..49e41d4 100644 --- a/mirzaev/ebala/system/public/js/administrators.js +++ b/mirzaev/ebala/system/public/js/administrators.js @@ -256,7 +256,10 @@ if (typeof window.administrators !== "function") { // Копирование статуса активной строки if ( typeof selected === "string" && selected === "true" && - document.body.contains(document.getElementById("popup")) + document.body.contains(document.getElementById("popup")) && + !document.body.contains( + document.querySelector('[data-selected="true"]'), + ) ) { row.setAttribute("data-selected", "true"); } diff --git a/mirzaev/ebala/system/public/js/chat.js b/mirzaev/ebala/system/public/js/chat.js index 585095e..821be63 100644 --- a/mirzaev/ebala/system/public/js/chat.js +++ b/mirzaev/ebala/system/public/js/chat.js @@ -706,7 +706,10 @@ if (typeof window.chat !== "function") { // Копирование статуса активной строки if ( typeof selected === "string" && selected === "true" && - document.body.contains(document.getElementById("popup")) + document.body.contains(document.getElementById("popup")) && + !document.body.contains( + document.querySelector('[data-selected="true"]'), + ) ) row.setAttribute("data-selected", "true"); } @@ -846,7 +849,12 @@ if (typeof window.chat !== "function") { // Копирование статуса активной строки if ( typeof selected === "string" && selected === "true" && - document.body.contains(document.getElementById("popup")) + document.body.contains( + document.getElementById("popup"), + ) && + !document.body.contains( + document.querySelector('[data-selected="true"]'), + ) ) row.setAttribute("data-selected", "true"); } } diff --git a/mirzaev/ebala/system/public/js/markets.js b/mirzaev/ebala/system/public/js/markets.js index 3759c60..3ee5391 100644 --- a/mirzaev/ebala/system/public/js/markets.js +++ b/mirzaev/ebala/system/public/js/markets.js @@ -1670,7 +1670,10 @@ if (typeof window.markets !== "function") { // Копирование статуса активной строки if ( typeof selected === "string" && selected === "true" && - document.body.contains(document.getElementById("popup")) + document.body.contains(document.getElementById("popup")) && + !document.body.contains( + document.querySelector('[data-selected="true"]'), + ) ) { row.setAttribute("data-selected", "true"); } @@ -2501,7 +2504,10 @@ if (typeof window.markets !== "function") { // Копирование статуса активной строки if ( typeof selected === "string" && selected === "true" && - document.body.contains(document.getElementById("popup")) + document.body.contains(document.getElementById("popup")) && + !document.body.contains( + document.querySelector('[data-selected="true"]'), + ) ) { row.setAttribute("data-selected", "true"); } diff --git a/mirzaev/ebala/system/public/js/operators.js b/mirzaev/ebala/system/public/js/operators.js index fadc406..970a302 100644 --- a/mirzaev/ebala/system/public/js/operators.js +++ b/mirzaev/ebala/system/public/js/operators.js @@ -256,7 +256,10 @@ if (typeof window.operators !== "function") { // Копирование статуса активной строки if ( typeof selected === "string" && selected === "true" && - document.body.contains(document.getElementById("popup")) + document.body.contains(document.getElementById("popup")) && + !document.body.contains( + document.querySelector('[data-selected="true"]'), + ) ) { row.setAttribute("data-selected", "true"); } diff --git a/mirzaev/ebala/system/public/js/tasks.js b/mirzaev/ebala/system/public/js/tasks.js index 685a21b..3ceb221 100755 --- a/mirzaev/ebala/system/public/js/tasks.js +++ b/mirzaev/ebala/system/public/js/tasks.js @@ -1698,7 +1698,10 @@ if (typeof window.tasks !== "function") { // Копирование статуса активной строки if ( typeof selected === "string" && selected === "true" && - document.body.contains(document.getElementById("popup")) + document.body.contains(document.getElementById("popup")) && + !document.body.contains( + document.querySelector('[data-selected="true"]'), + ) ) { row.setAttribute("data-selected", "true"); } @@ -2151,7 +2154,10 @@ if (typeof window.tasks !== "function") { // Копирование статуса активной строки if ( typeof selected === "string" && selected === "true" && - document.body.contains(document.getElementById("popup")) + document.body.contains(document.getElementById("popup")) && + !document.body.contains( + document.querySelector('[data-selected="true"]'), + ) ) { row.setAttribute("data-selected", "true"); } @@ -2311,7 +2317,10 @@ if (typeof window.tasks !== "function") { // Копирование статуса активной строки if ( typeof selected === "string" && selected === "true" && - document.body.contains(document.getElementById("popup")) + document.body.contains(document.getElementById("popup")) && + !document.body.contains( + document.querySelector('[data-selected="true"]'), + ) ) { row.setAttribute("data-selected", "true"); } @@ -2399,7 +2408,10 @@ if (typeof window.tasks !== "function") { // Копирование статуса активной строки if ( typeof selected === "string" && selected === "true" && - document.body.contains(document.getElementById("popup")) + document.body.contains(document.getElementById("popup")) && + !document.body.contains( + document.querySelector('[data-selected="true"]'), + ) ) { row.setAttribute("data-selected", "true"); } @@ -2642,7 +2654,10 @@ if (typeof window.tasks !== "function") { // Копирование статуса активной строки if ( typeof selected === "string" && selected === "true" && - document.body.contains(document.getElementById("popup")) + document.body.contains(document.getElementById("popup")) && + !document.body.contains( + document.querySelector('[data-selected="true"]'), + ) ) { row.setAttribute("data-selected", "true"); } @@ -2757,7 +2772,10 @@ if (typeof window.tasks !== "function") { // Копирование статуса активной строки if ( typeof selected === "string" && selected === "true" && - document.body.contains(document.getElementById("popup")) + document.body.contains(document.getElementById("popup")) && + !document.body.contains( + document.querySelector('[data-selected="true"]'), + ) ) { row.setAttribute("data-selected", "true"); } @@ -3813,7 +3831,12 @@ if (typeof window.tasks !== "function") { // Копирование статуса активной строки if ( typeof selected === "string" && selected === "true" && - document.body.contains(document.getElementById("popup")) + document.body.contains( + document.getElementById("popup"), + ) && + !document.body.contains( + document.querySelector('[data-selected="true"]'), + ) ) { row.setAttribute("data-selected", "true"); } @@ -3916,7 +3939,12 @@ if (typeof window.tasks !== "function") { // Копирование статуса активной строки if ( typeof selected === "string" && selected === "true" && - document.body.contains(document.getElementById("popup")) + document.body.contains( + document.getElementById("popup"), + ) && + !document.body.contains( + document.querySelector('[data-selected="true"]'), + ) ) { row.setAttribute("data-selected", "true"); } @@ -4022,7 +4050,12 @@ if (typeof window.tasks !== "function") { // Копирование статуса активной строки if ( typeof selected === "string" && selected === "true" && - document.body.contains(document.getElementById("popup")) + document.body.contains( + document.getElementById("popup"), + ) && + !document.body.contains( + document.querySelector('[data-selected="true"]'), + ) ) { row.setAttribute("data-selected", "true"); } @@ -4145,7 +4178,12 @@ if (typeof window.tasks !== "function") { // Копирование статуса активной строки if ( typeof selected === "string" && selected === "true" && - document.body.contains(document.getElementById("popup")) + document.body.contains( + document.getElementById("popup"), + ) && + !document.body.contains( + document.querySelector('[data-selected="true"]'), + ) ) { row.setAttribute("data-selected", "true"); } @@ -4968,7 +5006,12 @@ if (typeof window.tasks !== "function") { // Копирование статуса активной строки if ( typeof selected === "string" && selected === "true" && - document.body.contains(document.getElementById("popup")) + document.body.contains( + document.getElementById("popup"), + ) && + !document.body.contains( + document.querySelector('[data-selected="true"]'), + ) ) { row.setAttribute("data-selected", "true"); } @@ -5071,7 +5114,12 @@ if (typeof window.tasks !== "function") { // Копирование статуса активной строки if ( typeof selected === "string" && selected === "true" && - document.body.contains(document.getElementById("popup")) + document.body.contains( + document.getElementById("popup"), + ) && + !document.body.contains( + document.querySelector('[data-selected="true"]'), + ) ) { row.setAttribute("data-selected", "true"); } @@ -5455,7 +5503,12 @@ if (typeof window.tasks !== "function") { // Копирование статуса активной строки if ( typeof selected === "string" && selected === "true" && - document.body.contains(document.getElementById("popup")) + document.body.contains( + document.getElementById("popup"), + ) && + !document.body.contains( + document.querySelector('[data-selected="true"]'), + ) ) { row.setAttribute("data-selected", "true"); } diff --git a/mirzaev/ebala/system/public/js/workers.js b/mirzaev/ebala/system/public/js/workers.js index a43048c..d94037c 100644 --- a/mirzaev/ebala/system/public/js/workers.js +++ b/mirzaev/ebala/system/public/js/workers.js @@ -2055,7 +2055,10 @@ if (typeof window.workers !== "function") { // Копирование статуса активной строки if ( typeof selected === "string" && selected === "true" && - document.body.contains(document.getElementById("popup")) + document.body.contains(document.getElementById("popup")) && + !document.body.contains( + document.querySelector('[data-selected="true"]'), + ) ) { row.setAttribute("data-selected", "true"); } @@ -3390,7 +3393,10 @@ if (typeof window.workers !== "function") { // Копирование статуса активной строки if ( typeof selected === "string" && selected === "true" && - document.body.contains(document.getElementById("popup")) + document.body.contains(document.getElementById("popup")) && + !document.body.contains( + document.querySelector('[data-selected="true"]'), + ) ) { row.setAttribute("data-selected", "true"); }