extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-06 18:12:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

also need to re-assemble image options, as I cant edit/remove them in editor

Browse Source
This commit is contained in:
Ralf Becker 2013-04-10 15:46:38 +00:00
parent 64c03e772d
commit ee65e7ae28
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
etemplate/inc/class.xul_io.inc.php
View File

@ -742,6 +742,7 @@ class xul_io
case 'image': case 'image':
$attr['name'] = $attr['src']; $attr['name'] = $attr['src'];
unset($attr['src']); unset($attr['src']);
$this->set_legacy_options($tag, $attr);
break; break;
case 'listbox': case 'listbox':
$attr['size'] = preg_replace('/,*$/','',$attr['rows'].','.$attr['size']); $attr['size'] = preg_replace('/,*$/','',$attr['rows'].','.$attr['size']);
@ -755,19 +756,8 @@ class xul_io
} }
break; break;
case 'nextmatch': case 'nextmatch':
// re-assemble legacy options in "size" attribute $this->set_legacy_options($tag, $attr);
if (empty($attr['size']) && $this->widget2xul[$tag]['size']) break;
{
foreach(explode(',', $this->widget2xul[$tag]['size']) as $l_attr)
{
$attr['size'] .= ($attr['size'] ? ',' : '').$attr[$l_attr];
unset($attr[$l_attr]);
}
while(substr($attr['size'], -1) == ',')
{
$attr['size'] = substr($attr['size'], 0, -1);
}
}
} }
$attr['help'] = $attr['statustext']; unset($attr['statustext']); $attr['help'] = $attr['statustext']; unset($attr['statustext']);
$attr['span'] .= $attr['class'] ? ','.$attr['class'] : ''; unset($attr['class']); $attr['span'] .= $attr['class'] ? ','.$attr['class'] : ''; unset($attr['class']);
@ -788,4 +778,27 @@ class xul_io
} }
return $imported; return $imported;
} }
/**
* re-assemble legacy options in "size" attribute
*
* @param string $tag
* @param array &$attr
*/
function set_legacy_options($tag, &$attr)
{
// re-assemble legacy options in "size" attribute
if (empty($attr['size']) && $this->widget2xul[$tag]['size'])
{
foreach(explode(',', $this->widget2xul[$tag]['size']) as $l_attr)
{
$attr['size'] .= ($attr['size'] ? ',' : '').$attr[$l_attr];
unset($attr[$l_attr]);
}
while(substr($attr['size'], -1) == ',')
{
$attr['size'] = substr($attr['size'], 0, -1);
}
}
}
} }