From 27d49bf102df9845e3f7fefb366c490a95152f7e Mon Sep 17 00:00:00 2001
From: igor <irigm@mail.ru>
Date: Thu, 12 Nov 2020 17:09:03 +0600
Subject: [PATCH] =?UTF-8?q?+=D0=A1=D1=82=D1=80=D0=B5=D0=BB=D0=BE=D1=87?=
 =?UTF-8?q?=D0=BD=D1=8B=D0=B5=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D0=B8?=
 =?UTF-8?q?!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 metadata/dbms/TCGallery.js      |  14 ++++--------
 metadata/dbms/editrecord.js     |  20 +++++-----------
 metadata/dbms/images/config.png | Bin 1361 -> 3044 bytes
 metadata/dbms/login.js          |  17 ++++++--------
 metadata/dbms/session.js        |   2 +-
 metadata/dbms/showrecord.js     |  39 +++++++++-----------------------
 metadata/dbms/tabs.js           |   1 +
 metadata/dbms/tools.js          |   2 +-
 8 files changed, 32 insertions(+), 63 deletions(-)

diff --git a/metadata/dbms/TCGallery.js b/metadata/dbms/TCGallery.js
index 916ac10..d431a72 100644
--- a/metadata/dbms/TCGallery.js
+++ b/metadata/dbms/TCGallery.js
@@ -7,10 +7,9 @@ function TCGallery(parent)
 		if(this.mas[0].style.opacity > 0.05)
 		{
 			this.mas[0].style.opacity = this.mas[0].style.opacity - 0.05;
-			this.timeout_id=setTimeout(function(thiz){return function(){thiz.work();}}(this),50);
+			this.timeout_id=setTimeout(()=>this.work(),50);
 
 			this.test++;
-			//console.info(this.test+' 50 '+this.mas[0].style.opacity);
 		}else
 		{
 			//Перестовляем Z индексы первый на последнее место (больший наверху)
@@ -29,12 +28,9 @@ function TCGallery(parent)
 			{	this.mas[i].style.opacity = 1;
 			}
 			this.mas.sort(function(a,b){return b.style.zIndex-a.style.zIndex;}); //Сортируем с макс Z индексом наверху в 0ле
-			this.timeout_id=setTimeout(function(thiz){return function(){thiz.work();}}(this),5000); //Перезапускаем таймер через 10 секунд с максимальным Z индексом
-	
+			this.timeout_id=setTimeout(()=>this.work(),5000); //Перезапускаем таймер через 10 секунд с максимальным Z индексом
 			this.selected();
-			
 			this.test++;
-			//console.info(this.test+' 5000 '+this.mas[0].style.opacity);
 		}
 	};
 	//Стартуем галерею
@@ -46,7 +42,7 @@ function TCGallery(parent)
 			if(maxz<this.mas[i].style.zIndex) maxz=this.mas[i].style.zIndex;
 		}
 		if(this.mas.length>0)
-			setTimeout(function(thiz){return function(){thiz.work();}}(this),5000);
+			setTimeout(()=>this.work(),5000);
 		maxz++;
 
 		//Кнопочки для переключения картинок
@@ -87,7 +83,7 @@ function TCGallery(parent)
 		}
 
 		clearTimeout(this.timeout_id)
-		this.timeout_id=setTimeout(function(thiz){return function(){thiz.work();}}(this),10000);
+		this.timeout_id=setTimeout(()=>this.work(),10000);
 		this.selected();
 	};
 	//Поменялся элемент
@@ -225,7 +221,7 @@ class TCGallery2
 		if(dx>0) dx=Math.ceil(dx); else dx=Math.floor(dx);
 		this.parent.scrollLeft+=dx;
 		if(this.parent.scrollLeft!=this.pos)
-			setTimeout(function(thiz){ return function(){ thiz.moveTo(); } }(this),10);
+			setTimeout(()=>this.moveTo(),10);
 	}
 
 }
diff --git a/metadata/dbms/editrecord.js b/metadata/dbms/editrecord.js
index 7fa830e..bea0eb9 100644
--- a/metadata/dbms/editrecord.js
+++ b/metadata/dbms/editrecord.js
@@ -785,11 +785,7 @@ class EdtRec
 		button.setAttribute("type","button");
 		button.style.cssText="margin:0px;margin-right:1px;";
 		button.setAttribute("value",trt('Apply'));
-		button.onclick=function(thiz){
-			return function(){
-				thiz.sendData();
-			};
-		}(this);
+		button.onclick=()=>this.sendData();
 		td.appendChild( button );
 		
 		button = document.createElement('input'); //Button cancel
@@ -798,7 +794,7 @@ class EdtRec
 		button.style.cssText="margin:0px;";
 		button.setAttribute("value",trt('Cancel'));
 		//button.onclick=function f_exit(this) { alert2(trt('Alert'),this.win.div);  }
-		button.onclick=function(thiz){ return function(){thiz.win.Close();};}(this);
+		button.onclick=()=>this.win.Close();
 		td.appendChild( button );
 		tr.appendChild(td);
 		eTable.tBodies[0].appendChild(tr);
@@ -1485,11 +1481,7 @@ class EdtRec
 
 		let readd=document.getElementById("readd_"+this.uid);
 		if(readd!==null && readd.checked){
-			//if(!confirm(trt("Successfully_added_data")+".\n"+trt("Add_more")+"?")) this.win.Close();
-
-			confirm2(trt('Warning'),trt("Successfully_added_data")+"<br>"+trt("Add_more")+"?",null,function(thiz){return function(){thiz.win.Close();};}(this));
-
-
+			confirm2(trt('Warning'),trt("Successfully_added_data")+"<br>"+trt("Add_more")+"?",null,()=>this.win.Close());
 		}else
 		{
 			this.win.Close();
@@ -1499,9 +1491,9 @@ class EdtRec
 	//The data has been updated successfully now telling the parent to update the record.
 	updateRows(node)
 	{
-		var typeNode=findFirstNode(node,"type");
-		var typeName=typeNode.getAttribute("n");
-		var id=typeNode.getAttribute("id");
+		let typeNode=findFirstNode(node,"type");
+		let typeName=typeNode.getAttribute("n");
+		let id=typeNode.getAttribute("id");
 		if (this.opener!=null)
 		{
 			if(this.opener.f_TypeName==typeName) //It would be better to make an array of open windows then check for everyone.
diff --git a/metadata/dbms/images/config.png b/metadata/dbms/images/config.png
index 9b58a6c77ace6c9a23791bc5ddeb06eb572d9870..c991601586943e1c509a5093e24de4371efc33b3 100644
GIT binary patch
delta 3039
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

delta 1343
zcmV-F1;F~`7tsokBYyw{b3#c}2nYxWd<bNS00009a7bBm000EJ000EJ0TJQNCjbBd
z8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11kOoBK~z|UwU^6pR8<_u
zKfg2g-g$P)AVokB3rGw;>La2MNq8s$>WV1JLP=rg#>fVu(tlimMA;z!L2Uv)ieX`p
zM^LP&!5E1MQ5VHRLx&a$v{O2d-kCYaMIY%*r_(9IcXjXmJ-**_&hPxrxk80l?;eci
zBv-EttF=%k@CYz%*xYB}iXi6^eLCRR-+r@W+nq}C%47~}+~&nT*nyZgfl!5dQ@|HS
znSG~rHMHH8fPZECTY`~0sXYSk0#=2@#mIsj@QiM3bsI7j3wUKu)1#v02=K&R5*OoF
zv3wg(e(+Y;qyk>v-TaI)<|I&akH|;Rsf^U0aJO8TP{8oWf4L9jqarM0o<HU`bdP*c
zBM&RxrhsU5xR`uqtcn?t00GA-$fT4oD;A|D8bV3oM1KbTHZ_qDGp0p~1<cKf99_1*
zB{)uiEwUF(U2#M@mEzw^ZB&N?g(Qwc{92r=9UTM%h2o;2AnhIP^xn8pY8IZ0^rv<f
z2w3AbFCMP;aWGmBKNXHrL@)*nAmd6&z<@EDQV?PL2DfPz3~w(V?4ZO}dt>?IESy<Q
zDpf~SG=IvWpDxmVy|-l25iEKz#^x1IGVsDeY|G-xtt2gH|0;Hi<U|^QcVxYLFq)TK
z7bTj^*Y9mCc>kyK2D=XbJd`0Apzl@>*})7obLKIS9@^%6Uw?_m=FTjLd+pOBrL-mk
zf&6SMC%Jl=pu>5dM{jR0T5Cd~5UEtU?C1fKsed$yM1oW*g;I)GEH;sAIFqq9Sjw>4
zlxfJ0<Dj+1w(UvDM_^eNj^m(|D(`5_YHRplDQyR`*(~{d9^1At#!O0Xj3J-T<9QxF
zpO3N;!c$5??L_vDcsEKZY}>~3JbrJxI;ntjmpbu058Jj;O3@MTF6X|$G7z1}y7Q|u
zM1NGCTRqo#=;2y!W;DtwzZ56`j&rWPi>`Q_a5#WxM^OF=57Fwfr=0SKP`2QyKJ2RL
zs9XX7$5L!wz68k+Est^nH2-)WFE=F6uByiK^$@f}<;VfB1o{okDC<>(HB08RuC8{p
zCPakJo?eb$xIC3K00~ROWtpOY%-|rYRDX)TzCHkAu^5@b!Kso1v@1c*-%X@a3deD9
z90!p}FIE%4{HYLqddgwOptZ*HJUq`sYhBS69hV2bSDp?Z1(H(<Z0o*FGMU8h_v82b
zNhXuDb>E&Ue==*r$E{X()4<w~KKl~bR%v8sBF*;ZQ>6QQ$z}(MJ}`?UHZob~D}R7|
z-s)}|Pyj}meL%M2P*JFGHCZQ2)(WA*)l($L(<c834BrQauFi6xB-v=<!ZkJ+M22n&
zW?aKHAVWe+!pQ#b+^y{}<__Q)-ROv{0A3vH8wdqiuxJs9WZ_Ae&Unn7J%@Zg&&?uR
zBAKCfel7TX+)NA<)1UQCPq?E49Di%s;5N<5iTno4D=qzh<66!qOHY5eB|h?@V2+Nt
z4c*Gft3c;{Ait``tQ$){P5{6OcgqEzt)B(X+(YuSmN84eYizh!Y$#bJ$KT)D<BRpL
zHHO_xu}2ia13vb}`d5wp7Z{64d+2aoGy-n};R=b97!GOlzL9F52o*Q+l{juo#F2D8
z=vBbeAhnG7JqL5y82Ljfei+oDW3BF{aphkM{{b|d%+~zIi%I|h002ovPDHLkV1kT1
BdRzbi

diff --git a/metadata/dbms/login.js b/metadata/dbms/login.js
index 2e6ce3c..1d8acc2 100644
--- a/metadata/dbms/login.js
+++ b/metadata/dbms/login.js
@@ -134,24 +134,21 @@ class DBMSUser
 			obj=document.getElementById('TLogin_E'+this.uid);
 			if(obj!==null)
 			{
-				obj.onclick=function(thiz)
-				{
-					return function()
+				obj.onclick=()=>
 					{
 						var xs='<?xml version="1.0" encoding="utf-8"?>\
 								<metadata fn="7">\
 										<cmd><![CDATA[3]]></cmd>\n\
-										<login><![CDATA['+document.getElementById('tcLogin'+thiz.uid).value+']]></login>\
-										<password><![CDATA['+document.getElementById('tcPassword'+thiz.uid).value+']]></password>\
+										<login><![CDATA['+document.getElementById('tcLogin'+this.uid).value+']]></login>\
+										<password><![CDATA['+document.getElementById('tcPassword'+this.uid).value+']]></password>\
 								</metadata>';
 
-						var request=new TRequest(thiz);
+						var request=new TRequest(this);
 						if(request.callServer(ScriptName,xs))
 						{
-								thiz.win.showProgressBar();
+								this.win.showProgressBar();
 						}
 					};
-				}(this);
 			}
 		}
 	};
@@ -169,8 +166,8 @@ class DBMSUser
 	//Checking the session without its extension, if it is completed, we display the authorization window.
 	checkSession()
 	{
-		$.getJSON('../session',{},function(thiz){return function(data){ if(data.result=='ERROR'){thiz.showLoginForm();} };}(this));
-		setTimeout(function(thiz){return function(){thiz.checkSession();};}(this), 10000);		
+		$.getJSON('../session',{},(data)=>{if(data.result=='ERROR'){this.showLoginForm();}});
+		setTimeout(()=>this.checkSession(), 10000);		
 	};
 
 	showShadow(visible)
diff --git a/metadata/dbms/session.js b/metadata/dbms/session.js
index b083c49..2e2041d 100644
--- a/metadata/dbms/session.js
+++ b/metadata/dbms/session.js
@@ -45,7 +45,7 @@ function CheckSession(path)
 	this.run=function()
 	{
 		this.sendReq('?fn=2&'+this.ses_name+'='+this.ses_id);
-		this.timer=setTimeout(function(thiz){ return function(){ thiz.run(); }}(this), 60000);
+		this.timer=setTimeout(()=>this.run(), 60000);
 	};
 
 	this.path=path; //URL файла session.php
diff --git a/metadata/dbms/showrecord.js b/metadata/dbms/showrecord.js
index 96fc04b..8808339 100644
--- a/metadata/dbms/showrecord.js
+++ b/metadata/dbms/showrecord.js
@@ -183,10 +183,10 @@ class SRec
 			htmlElement.innerHTML=str;
 		}
 
-		document.getElementById('SRec_Add_'+this.uid).onclick=function(thiz){return function(){thiz.insertRecord();};}(this);
-		document.getElementById('SRec_Del_'+this.uid).onclick=function(thiz){return function(){thiz.deleteRecord();};}(this);
-		document.getElementById('SRec_Exc_'+this.uid).onclick=function(thiz){return function(){thiz.showreport('xls');};}(this);
-		document.getElementById('SRec_Rfr_'+this.uid).onclick=function(thiz){return function(){thiz.appendFilter(); thiz.sendFilter(-1,0);};}(this);
+		document.getElementById('SRec_Add_'+this.uid).onclick = ()=>this.insertRecord();
+		document.getElementById('SRec_Del_'+this.uid).onclick = ()=>this.deleteRecord();
+		document.getElementById('SRec_Exc_'+this.uid).onclick = ()=>this.showreport('xls');
+		document.getElementById('SRec_Rfr_'+this.uid).onclick = ()=>{this.appendFilter(); this.sendFilter(-1,0);};
 	}
 
 	//Update dimensions of the elements (the main table in absolute coordinates).
@@ -1040,7 +1040,7 @@ class SRec
 		th.style.cssText='width: 1%; cursor: pointer; text-decoration: underline;';
 		th.onmouseover=function(){ this.style.backgroundColor=g_rowColor2; };
 		th.onmouseout=function(){ this.style.backgroundColor='var(--header-color)'; };
-		th.onclick=function(thiz){return function(){ for(let i=0;i<thiz.masChBox.length;i++){ if(!thiz.masChBox[i].disabled) thiz.masChBox[i].checked = ! thiz.masChBox[i].checked; }};}(this);
+		th.onclick= ()=>{ for(let i=0;i<this.masChBox.length;i++){ if(!this.masChBox[i].disabled) this.masChBox[i].checked = ! this.masChBox[i].checked; }};
 		tr.appendChild(th);
 
 		let pos=0;
@@ -1520,36 +1520,19 @@ class SRec
 	deleteRecord(recordid)
 	{
 		confirm2(trt('Warning'),trt("Are_you_sure_you_want_to_delete_the_entries")+"<br>"
-			,function(thiz){
-					return function(){
-
-						for(let i=0;i<thiz.masChBox.length;i++)
+			,()=>{
+						for(let i=0;i<this.masChBox.length;i++)
 						{
-							if(thiz.masChBox[i].checked)
+							if(this.masChBox[i].checked)
 							{
-								if(thiz.request.callServer(ScriptName,'<?xml version="1.0" encoding="utf-8"?><metadata fn="3"><type n="'+thiz.f_TypeName+'" id="'+thiz.masChBox[i].value+'"></type></metadata>',true))
+								if(this.request.callServer(ScriptName,'<?xml version="1.0" encoding="utf-8"?><metadata fn="3"><type n="'+this.f_TypeName+'" id="'+this.masChBox[i].value+'"></type></metadata>',true))
 								{
-									thiz.showProgressBar();
+									this.showProgressBar();
 								}
 							}
 						}
-					};
-				}(this)
-			,null);
-		
-		/*if (confirm(trt("Are_you_sure_you_want_to_delete_the_entries")+'?'))
-		{
-			for(let i=0;i<this.masChBox.length;i++)
-			{
-				if(this.masChBox[i].checked)
-				{
-					if(this.request.callServer(ScriptName,'<?xml version="1.0" encoding="utf-8"?><metadata fn="3"><type n="'+this.f_TypeName+'" id="'+this.masChBox[i].value+'"></type></metadata>',true))
-					{
-						this.showProgressBar();
 					}
-				}
-			}
-		}*/
+			,null);
 		return false;
 	}
 
diff --git a/metadata/dbms/tabs.js b/metadata/dbms/tabs.js
index bfcba51..da7f65b 100644
--- a/metadata/dbms/tabs.js
+++ b/metadata/dbms/tabs.js
@@ -67,6 +67,7 @@ class tcTabs
 				return this.tbs[i];
 			}
 		}
+		return null;
 	}
 }
 
diff --git a/metadata/dbms/tools.js b/metadata/dbms/tools.js
index f0f4e9e..4dfd8e8 100644
--- a/metadata/dbms/tools.js
+++ b/metadata/dbms/tools.js
@@ -1304,7 +1304,7 @@ class TWin
 		this.ca=document.getElementById('TWin_Ca_'+this.tWinId);
 		this.setSel();
 
-		this.div.onmousedown=function(thiz){ return function(e){ thiz.setSel(); } }(this);
+		this.div.onmousedown=(e)=>this.setSel();
 		//Кнопка закрыть окно
 		let obj=document.getElementById('TWin_CL_'+this.tWinId);
 		if(obj!=null){