cwUi.cpp : Fixed bug where 'title' element type had the wrong type string.
This commit is contained in:
parent
239f9c1916
commit
fab87f7050
4
cwUi.cpp
4
cwUi.cpp
@ -366,7 +366,7 @@ namespace cw
|
|||||||
|
|
||||||
// form the create json message string
|
// form the create json message string
|
||||||
//unsigned i = snprintf( p->buf, p->bufN, "{ \"op\":\"create\", \"parent\":\"%s\", \"children\":{ \"%s\":{ \"eleName\":\"%s\", \"appId\":%i, \"uuId\":%i, \"class\":\"%s\", \"title\":\"%s\" ", parentEleName, eleTypeStr, eleName, appId, newEle->uuId, clas, title );
|
//unsigned i = snprintf( p->buf, p->bufN, "{ \"op\":\"create\", \"parent\":\"%s\", \"children\":{ \"%s\":{ \"eleName\":\"%s\", \"appId\":%i, \"uuId\":%i, \"class\":\"%s\", \"title\":\"%s\" ", parentEleName, eleTypeStr, eleName, appId, newEle->uuId, clas, title );
|
||||||
unsigned i = snprintf( p->buf, p->bufN, "{ \"op\":\"create\", \"parentUuId\":\"%i\", \"type\":\"%s\", \"eleName\":\"%s\", \"appId\":\"%i\", \"uuId\":%i, \"className\":\"%s\", \"title\":\"%s\" ", parentEle->uuId, eleTypeStr, eleName==nullptr ? "" : eleName, appId, newEle->uuId, clas, title );
|
unsigned i = snprintf( p->buf, p->bufN, "{ \"op\":\"create\", \"parentUuId\":\"%i\", \"type\":\"%s\", \"eleName\":\"%s\", \"appId\":\"%i\", \"uuId\":%i, \"className\":\"%s\", \"title\":\"%s\" ", parentEle->uuId, eleTypeStr, eleName==nullptr ? "" : eleName, appId, newEle->uuId, clas==nullptr ? " " : clas, title==nullptr ? " " : title );
|
||||||
|
|
||||||
|
|
||||||
// add the UI specific attributes
|
// add the UI specific attributes
|
||||||
@ -1034,7 +1034,7 @@ cw::rc_t cw::ui::createDiv( handle_t h, unsigned& uuIdRef, unsigned wsSessId, un
|
|||||||
{ return _createOneEle( _handleToPtr(h), uuIdRef, "div", wsSessId, parentUuId, eleName, appId, clas, title ); }
|
{ return _createOneEle( _handleToPtr(h), uuIdRef, "div", wsSessId, parentUuId, eleName, appId, clas, title ); }
|
||||||
|
|
||||||
cw::rc_t cw::ui::createTitle( handle_t h, unsigned& uuIdRef, unsigned wsSessId, unsigned parentUuId, const char* eleName, unsigned appId, const char* clas, const char* title )
|
cw::rc_t cw::ui::createTitle( handle_t h, unsigned& uuIdRef, unsigned wsSessId, unsigned parentUuId, const char* eleName, unsigned appId, const char* clas, const char* title )
|
||||||
{ return _createOneEle( _handleToPtr(h), uuIdRef, "option", wsSessId, parentUuId, eleName, appId, clas, title ); }
|
{ return _createOneEle( _handleToPtr(h), uuIdRef, "title", wsSessId, parentUuId, eleName, appId, clas, title ); }
|
||||||
|
|
||||||
cw::rc_t cw::ui::createButton( handle_t h, unsigned& uuIdRef, unsigned wsSessId, unsigned parentUuId, const char* eleName, unsigned appId, const char* clas, const char* title )
|
cw::rc_t cw::ui::createButton( handle_t h, unsigned& uuIdRef, unsigned wsSessId, unsigned parentUuId, const char* eleName, unsigned appId, const char* clas, const char* title )
|
||||||
{ return _createOneEle( _handleToPtr(h), uuIdRef, "button", wsSessId, parentUuId, eleName, appId, clas, title ); }
|
{ return _createOneEle( _handleToPtr(h), uuIdRef, "button", wsSessId, parentUuId, eleName, appId, clas, title ); }
|
||||||
|
@ -309,6 +309,10 @@ function ui_create_ctl( parent_ele, ele_type, label, d, dfltEleClassName )
|
|||||||
|
|
||||||
// if label is not null then create an enclosing 'label' element
|
// if label is not null then create an enclosing 'label' element
|
||||||
if( label != null )
|
if( label != null )
|
||||||
|
{
|
||||||
|
label = label.trim();
|
||||||
|
|
||||||
|
if( label.length > 0)
|
||||||
{
|
{
|
||||||
label_ele = dom_create_ele("label");
|
label_ele = dom_create_ele("label");
|
||||||
|
|
||||||
@ -316,6 +320,7 @@ function ui_create_ctl( parent_ele, ele_type, label, d, dfltEleClassName )
|
|||||||
|
|
||||||
div_ele.appendChild(label_ele)
|
div_ele.appendChild(label_ele)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return ui_create_ele( div_ele, ele_type, d, dfltEleClassName );
|
return ui_create_ele( div_ele, ele_type, d, dfltEleClassName );
|
||||||
}
|
}
|
||||||
@ -327,15 +332,20 @@ function ui_create_div( parent_ele, d )
|
|||||||
if( div_ele != null )
|
if( div_ele != null )
|
||||||
{
|
{
|
||||||
|
|
||||||
if( d.title != null && d.title.length > 0 )
|
if( d.title != null )
|
||||||
|
{
|
||||||
|
var title = d.title.trim()
|
||||||
|
|
||||||
|
if( title.length > 0 )
|
||||||
{
|
{
|
||||||
var p_ele = dom_create_ele("p")
|
var p_ele = dom_create_ele("p")
|
||||||
|
|
||||||
p_ele.innerHTML = d.title
|
p_ele.innerHTML = title
|
||||||
|
|
||||||
div_ele.appendChild( p_ele )
|
div_ele.appendChild( p_ele )
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return div_ele;
|
return div_ele;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user