mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-26 08:38:54 +01:00
omit unit, when no size is given; display unit to the user, so he knows what he is selecting
This commit is contained in:
parent
945f256e1b
commit
8b740d21ff
@ -72,7 +72,7 @@ class egw_ckeditor_config
|
||||
$unit = 'px';
|
||||
$size = (string)(int)$size;
|
||||
}
|
||||
return $size.$unit;
|
||||
return $size.($size?$unit:'');
|
||||
}
|
||||
|
||||
/**
|
||||
@ -228,7 +228,7 @@ class egw_ckeditor_config
|
||||
if (empty($unit)) $unit = 'px';
|
||||
foreach(self::$font_size_options as $k => $v)
|
||||
{
|
||||
$config['fontSize_sizes'] .= $v.'/'.$k.$unit.';';
|
||||
$config['fontSize_sizes'] .= $v.$unit.'/'.$k.$unit.';';
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user