holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix preprocessor was not replacing all size attributes with width for web-components

Browse Source
This commit is contained in:
ralf 2022-07-22 17:20:44 +02:00
parent 8a53646188
commit 0044398090
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
api/etemplate.php
View File

@ -183,13 +183,6 @@ function send_template()
) . "></$tag>";
}, $str);
// Change size=# attribute to width, size is small|medium|large with shoelace
$str = preg_replace_callback('#<([^/>]+) size="([[:digit:]]+)"([^/>]+?)/>#su', static function ($matches)
{
return "<{$matches[1]} width=\"{$matches[2]}ex\" {$matches[3]}/>";
}, $str);
// handling of select and taglist widget, incl. removing of type attribute
$str = preg_replace_callback('#<(select|taglist|listbox)(-[^ ]+)? ([^>]+?)(/|>(.*?)</select)>#s', static function (array $matches) {
preg_match_all('/(^|\s)([a-z0-9_-]+)="([^"]*)"/i', $matches[3], $attrs, PREG_PATTERN_ORDER);
@ -355,7 +348,7 @@ function send_template()
'></et2-' . $matches[3] : $matches[ADD_ET2_PREFIX_LAST_GROUP]) . '>';
}, $str);
}
// change all attribute-names of new et2-* widgets to camelCase
// change all attribute-names of new et2-* widgets to camelCase, and other attribute modifications for all web-components
$str = preg_replace_callback('/<(et2|records)-([a-z-]+)\s([^>]+)>/', static function(array $matches)
{
preg_match_all('/(^| )([a-z\d_-]+)="([^"]+)"/i', $matches[3], $attrs, PREG_PATTERN_ORDER);
@ -377,6 +370,13 @@ function send_template()
unset($attrs['class']);
}
// Change size=# attribute to width, size is small|medium|large with Shoelace
if (isset($attrs['size']))
{
$attrs['width'] = (int)$attrs['size'].'em';
unset($attrs['size']);
}
$ret = str_replace($matches[3], implode(' ', array_map(static function ($name, $value) {
return $name . '="' . $value . '"';
}, array_keys($attrs), $attrs)).(substr($matches[3], -1) === '/' ? '/' : ''), $matches[0]);