mcndave/picea-ui
1
0 Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

Merge branch 'master' of https://git.mcnd.ca/mcndave/picea-ui

Browse Source
This commit is contained in:
mcndave committed 2020-10-06 15:54:35 +00:00
2 parents 7437bbfc73 95c30be9f8
commit 6020fa300d
8 files changed
+73 -42
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Form/UiSelect.php
+4 -15
View File
@@ -38,26 +38,23 @@ class UiSelect extends UiElement implements Extension {
protected function setList(array $list, $selected, bool $strict = true) : void
{
foreach($list as $key => $item) {
$isSelected = $this->isSelected($key, $selected, $strict);
if ($item instanceof UiElement) {
$this->append($item);
continue;
}
elseif ( is_array($item) ) {
$obj = new UiElement("optgroup");
$obj->text($key);
$obj->attributes(['label' => $key]);
foreach($item as $subKey => $subItem) {
$obj->append($this->createOption((string) $subItem, $subKey, $isSelected));
$obj->append($this->createOption((string) $subItem, $subKey, $this->isSelected($subKey, $selected, $strict)));
}
}
else {
$obj = $this->createOption((string) $item, $key, $isSelected);
$obj = $this->createOption((string) $item, $key, $this->isSelected($key, $selected, $strict));
}
$this->append($obj);
}
}
@@ -77,14 +74,6 @@ class UiSelect extends UiElement implements Extension {
protected function isSelected($check, $value, bool $strict = true) : bool
{
if (false !== ( $f = filter_var($value, FILTER_VALIDATE_INT) ) ) {
$value = $f;
}
elseif (false !== ( $f = filter_var($value, FILTER_VALIDATE_FLOAT) ) ) {
$value = $f;
}
return $strict ? $check === $value : $check == $value;
}
}