extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 00:54:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove again removing of empty description and label widgets as they are needed in tables to place widgets in the correct column

Browse Source 
also add (currently) commented out conversation for taglist
This commit is contained in:
ralf 2022-05-27 16:24:57 +02:00
parent 8614d5bd4f
commit c174e29238
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
api/etemplate.php
View File

@ -97,9 +97,6 @@ function send_template()
// modify <(vfs-mime|link-string|link-list) --> <et2-* // modify <(vfs-mime|link-string|link-list) --> <et2-*
$str = preg_replace(ADD_ET2_PREFIX_LEGACY_REGEXP, '<et2-$1 $2></et2-$1>', $str); $str = preg_replace(ADD_ET2_PREFIX_LEGACY_REGEXP, '<et2-$1 $2></et2-$1>', $str);
// remove (unnecessary) empty widgets (were required with first eTemplate)
$str = preg_replace('#^\s*<(description|label)/>\n#m', '', $str);
// ^^^^^^^^^^^^^^^^ above widgets get transformed independent of legacy="true" set in overlay ^^^^^^^^^^^^^^^^^^ // ^^^^^^^^^^^^^^^^ above widgets get transformed independent of legacy="true" set in overlay ^^^^^^^^^^^^^^^^^^
// eTemplate marked as legacy --> replace only some widgets (eg. requiring jQueryUI) with web-components // eTemplate marked as legacy --> replace only some widgets (eg. requiring jQueryUI) with web-components
@ -235,12 +232,12 @@ function send_template()
'></et2-' . $matches[3] : $matches[ADD_ET2_PREFIX_LAST_GROUP]) . '>'; '></et2-' . $matches[3] : $matches[ADD_ET2_PREFIX_LAST_GROUP]) . '>';
}, $str); }, $str);
// handling of date and partially implemented select widget (no search or tags attribute), incl. removing of type attribute // handling of partially implemented select widget (no search or tags attribute), incl. removing of type attribute
$str = preg_replace_callback('#<(select)(-[^ ]+)? ([^>]+)/>#', static function (array $matches) { $str = preg_replace_callback('#<(select)(-[^ ]+)? ([^>]+)/>#', static function (array $matches) {
preg_match_all('/(^| )([a-z0-9_-]+)="([^"]+)"/i', $matches[3], $attrs, PREG_PATTERN_ORDER); preg_match_all('/(^| )([a-z0-9_-]+)="([^"]*)"/i', $matches[3], $attrs, PREG_PATTERN_ORDER);
$attrs = array_combine($attrs[2], $attrs[3]); $attrs = array_combine($attrs[2], $attrs[3]);
// add et2-prefix for <date-* and <select-* without search or tags attribute // add et2-prefix for <select-* without search or tags attribute
if (!isset($attrs['search']) && !isset($attrs['tags'])) if (!isset($attrs['search']) && !isset($attrs['tags']))
{ {
// type attribute need to go in widget type <select type="select-account" --> <et2-select-account // type attribute need to go in widget type <select type="select-account" --> <et2-select-account
@ -253,6 +250,19 @@ function send_template()
} }
return $matches[0]; return $matches[0];
}, $str); }, $str);
/* handling of partially implemented taglist widget (no subtypes and autocomplete_url attribute yet)
$str = preg_replace_callback('#<(taglist)(-[^ ]+)? ([^>]+)/>#', static function (array $matches) {
preg_match_all('/(^| )([a-z0-9_-]+)="([^"]*)"/i', $matches[3], $attrs, PREG_PATTERN_ORDER);
$attrs = array_combine($attrs[2], $attrs[3]);
// add et2-prefix for vanilla <taglist without or empty autocomplete_url
if (empty($matches[2]) && isset($attrs['autocomplete_url']) && $attrs['autocomplete_url'] === '')
{
return '<et2-' . $matches[1] . $matches[2] . ' ' . $matches[3] . '></et2-' . $matches[1] . $matches[2] . '>';
}
return $matches[0];
}, $str);*/
} }
$processing = microtime(true); $processing = microtime(true);