Merge branch 'master' of http://git.dirt.kz/igor/Metadata_PHP
This commit is contained in:
@ -20,7 +20,7 @@ class EdtRec
|
||||
this.win.setContent('<div id="eDiv'+this.uid+'" style="width: 100%; /*height: 100%;*/ position: relative;"></div>');
|
||||
|
||||
let eDiv=document.getElementById('eDiv'+this.uid);
|
||||
eDiv.innerHTML = '<table width="100%" height="100%" border="0px" cellspacing="0" cellpadding="0"><tr><td style="vertical-align:middle;" bgcolor="#F1F1F1"><center><IMG src="../resources/metadata/dbms/images/loading.gif"></center></td></tr></table>'
|
||||
eDiv.innerHTML = '<table width="100%" height="100%"><tr><td style="vertical-align:middle;" bgcolor="#F1F1F1"><center><IMG src="../resources/metadata/dbms/images/loading.gif"></center></td></tr></table>'
|
||||
|
||||
if(caption!='')
|
||||
this.win.setCaption(document.createTextNode(caption));
|
||||
@ -405,14 +405,11 @@ class EdtRec
|
||||
}else
|
||||
if(vt=="i4")
|
||||
{
|
||||
|
||||
//alert2(trt('Alert'),"prop name = "+nodeProp.getAttribute("n"));
|
||||
|
||||
//If there is a node "list" with the elements "CheckBox" then create them.
|
||||
var opt=findNode(nodeProp, "options");
|
||||
let opt=findNode(nodeProp, "options");
|
||||
if(opt!=null) //If combobox
|
||||
{
|
||||
var select = document.createElement('select');
|
||||
{
|
||||
let select = document.createElement('select');
|
||||
select.style.cssText="width: 100%;";
|
||||
select.setAttribute("name",nodeProp.getAttribute("n"));
|
||||
select.setAttribute("id","prop_"+this.uid+"_"+nodeProp.getAttribute("n"));
|
||||
@ -421,7 +418,7 @@ class EdtRec
|
||||
{
|
||||
if(opt.nodeName=="option")
|
||||
{
|
||||
option = document.createElement("option");
|
||||
let option = document.createElement("option");
|
||||
option.setAttribute("value",opt.getAttribute("val"));
|
||||
option.appendChild(document.createTextNode(opt.getAttribute("d")));
|
||||
select.appendChild( option );
|
||||
|
||||
Reference in New Issue
Block a user