X-Git-Url: http://git.shiar.nl/perl/html-form-simple.git/blobdiff_plain/d5415f8292000c0eba35458ce61500eaff9cd4d1..d74d61d638a9f0c83f3860de02225c16309ccf2d:/lib/HTML/Form/Simple.pm
diff --git a/lib/HTML/Form/Simple.pm b/lib/HTML/Form/Simple.pm
index 6fb9080..bbeb6b6 100644
--- a/lib/HTML/Form/Simple.pm
+++ b/lib/HTML/Form/Simple.pm
@@ -71,8 +71,14 @@ sub hidden {
my $self = shift;
my ($name, $value, $attr) = $self->_attr(2, @_);
- $attr = {type => 'hidden', name => $name, value => $value};
- #TODO: $attr
+ if (ref $name eq 'HASH') {
+ my @return = map { $self->hidden($_, $name->{$_}, $attr) } sort keys %$name;
+ return wantarray ? @return : join(defined $, ? $, : '', @return);
+ }
+
+ $attr->{name } = $name if defined $name;
+ $attr->{value} = $value if defined $value;
+ $attr->{type} = 'hidden' unless defined $attr->{type};
return $self->tag(input => $attr);
}
@@ -107,6 +113,8 @@ sub select {
my @options = map { ref $_ ? $_ : {value => $_} } @$rows;
+ my @return;
+
if ($attr->{type} eq 'select') {
delete $attr->{type};
if (defined $default) {
@@ -114,17 +122,17 @@ sub select {
$_->{selected} = 1 if defined $_->{value} and $_->{value} eq $default;
}
}
- my @return = (
+ @return = (
$self->tag(select => $attr),
(map { $self->tag(option => $_) } @options),
'',
);
- return wantarray ? @return : join('', @return);
}
else {
if (defined $attr->{id} and $attr->{id} ne '') {
- defined $_->{id} or defined $_->{value} and $_->{id} = $attr->{id}.'_'.$_->{value}
- for @options;
+ defined $_->{id}
+ or defined $_->{value} and $_->{id} = $attr->{id}.'_'.$_->{value}
+ for @options;
}
if (defined $attr->{label}) {
defined $_->{value} and not defined $_->{label}
@@ -138,14 +146,15 @@ sub select {
}
}
$_ = {%$attr, %$_} for @options;
- my @return = map {
+ @return = map {
my $label = delete $_->{label};
defined $label && $label ne ''
? '"
: $self->tag(input => $_)
} @options;
- return wantarray ? @return : join('', @return);
}
+
+ return wantarray ? @return : join(defined $, ? $, : '', @return);
}
sub radio {
@@ -176,11 +185,20 @@ sub check {
my $self = shift;
my ($name, $label, $checked, $attr) = $self->_attr(3, @_);
- $attr->{label } = $label if defined $label;
- $attr->{checked} = $checked if defined $checked;
- $attr->{value } = '1' unless exists $attr->{value};
+ my $rows = defined $label ? ref $label eq 'ARRAY' ? $label : [$label] : [{}];
+ ref $_ eq 'HASH' or $_ = {label => $_} for @$rows;
+ if (defined $checked) {
+ if (ref $checked eq 'ARRAY') {
+ $_->{checked} = shift @$checked for @$rows;
+ push @$rows, map { {checked => $_} } @$checked;
+ }
+ else {
+ $_->{checked} = $checked for @$rows;
+ }
+ }
+ exists $rows->[$_]->{value} or $rows->[$_]->{value} = $_ + 1 for 0 .. $#$rows;
- $self->select($name, [$attr], {type => 'checkbox'});
+ $self->select($name, $rows, {%$attr, type => 'checkbox'});
}
1;