From 8d52620d3207f8c71745c63d34edcd27b85d9711 Mon Sep 17 00:00:00 2001 From: borissedw Date: Sat, 11 Nov 2023 14:26:17 +0300 Subject: [PATCH] 0.0.348 --- static/js/user_profile_2.js | 83 +++++++++++-------------------------- 1 file changed, 25 insertions(+), 58 deletions(-) diff --git a/static/js/user_profile_2.js b/static/js/user_profile_2.js index d653801..8f24fb0 100644 --- a/static/js/user_profile_2.js +++ b/static/js/user_profile_2.js @@ -774,7 +774,6 @@ function open_curtain (left=null,right=null,overlay=null,close=null){ handler_text.style.fontSize = '16px' } - //тут боди по неведомой для меня причне получал перманентный оверфлоу в значении hidden и вырубал все блоки кроме Новое Сообщение, вероятно для него эта проверка и делалась if (!curtain.classList.contains('open')){ body.style.overflowY = '' } else { @@ -812,82 +811,50 @@ function newCurtainZIndex (curtain) { function getInfoCurtain (curtain,zIndex,name) { let data = {} + let curtain_f_w = null if (curtain){ let type_curt = getTypeOfData(curtain) if (curtain[0] && type_curt === 'object'){ - curtain = curtain[0] + curtain_f_w = curtain[0] } - if (name){ - let dataset = curtain.dataset - let name = '' - if (dataset){ - name = dataset['name'] - data['name'] = name - } - } - if (zIndex){ - if (curtain.style.zIndex){ - data['zIndex'] = curtain.style.zIndex - } else{ - data['zIndex'] = 'z-index not finded' - } - } } else { - let new_curtain = getOpenCurtain() - let type_curt = getTypeOfData(new_curtain) - if (new_curtain[0]){ + curtain_f_w = getOpenCurtain() + let type_curt = getTypeOfData(curtain_f_w) + if (curtain_f_w[0]){ if (type_curt === 'object'){ - new_curtain = new_curtain[0] + curtain_f_w = curtain_f_w[0] } } - if (name){ - let dataset = new_curtain.dataset - let name = '' - if (dataset){ - name = dataset['name'] - data['name'] = name - } + } + if (name){ + let dataset = curtain_f_w.dataset + let name = '' + if (dataset){ + name = dataset['name'] + data['name'] = name + } + } + if (zIndex){ + if (curtain_f_w.style.zIndex){ + data['zIndex'] = curtain_f_w.style.zIndex + } else{ + data['zIndex'] = 'z-index not finded' } - if (zIndex){ - if (new_curtain.style.zIndex){ - data['zIndex'] = new_curtain.style.zIndex - } else{ - data['zIndex'] = 'z-index not finded' - } - } } return data } function getOpenCurtain () { - let curtains = document.querySelectorAll(".curtain") - let curtain = '' - if (curtains.length > 1){ - curtain = [] + let curtains = document.querySelectorAll(".curtain.open") + if (!curtains){ + curtains = document.querySelector('.curtain') + console.log(`not finded open curtain choice first curtain named=${curtains.dataset['name']}`) } - let i = 0 - - curtains.forEach(function (){ - let el = curtains[i] - if (el.classList.contains('open')){ - let type_data = getTypeOfData(curtain) - if (type_data === 'object'){ - curtain.push(el) - } else { - curtain = el - } - } - i++ - }) - if (!curtain){ - curtain = document.querySelector('.curtain') - console.log(`not finded open curtain choice first curtain named=${curtain.dataset['name']}`) - } - return curtain + return curtains } function getTypeOfData (data) {