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:
Dave Mc Nicoll 2020-10-06 11:40:53 -04:00
commit 95c30be9f8
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Form/UiForm.php
View File

@ -57,6 +57,12 @@ class UiForm extends UiElement implements Extension {
$this->option('tag-type', 'single'); $this->option('tag-type', 'single');
if ($attributes['class'] ?? false) {
$attributes['class'] .= " {$this->attributes['class']}";
unset($this->attributes['class']);
}
$this->attributes([ 'method' => $method, 'action' => $action ] + $attributes); $this->attributes([ 'method' => $method, 'action' => $action ] + $attributes);
if ( $method !== "get" ) { if ( $method !== "get" ) {

8
src/Form/UiSelect.php
View File

@ -75,14 +75,6 @@ class UiSelect extends UiElement implements Extension {
protected function isSelected($check, $value, bool $strict = true) : bool 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; return $strict ? $check === $value : $check == $value;
} }
} }

2
src/Method/FormHandler.php
View File

@ -34,7 +34,7 @@ class FormHandler {
$this->initialize(); $this->initialize();
} }
protected function formSent() : void public function formSent() : void
{ {
if ( false !== $this->context->formSent = $this->sent ) { if ( false !== $this->context->formSent = $this->sent ) {
if ( $this->context->formName ?? false ) { if ( $this->context->formName ?? false ) {