--- trunk/lib/Frey/Action.pm 2008/12/09 20:31:41 780 +++ trunk/lib/Frey/Action.pm 2008/12/09 20:31:43 783 @@ -26,7 +26,7 @@ default => sub { {} }, ); -has 'input_resize_step' => ( +has 'input_step_size' => ( documentation => 'Resize input fields by this step', is => 'rw', isa => 'Int', @@ -115,23 +115,50 @@ sub select_values { my ( $name, $attr_type, $values ) = @_; - if ( $#$values > 3 ) { + my $max_value_len = 0; + my @values; + my $html = ''; + + foreach ( @$values ) { + my $v = ref($_) eq 'HASH' ? $_->{$name} : $_; + warn "## value '$v'"; + push @values, $v; + $max_value_len = length($v) if length($v) > $max_value_len; + } + + warn "# max_value_len: $max_value_len"; + + if ( $#values > 3 ) { my $options = join("\n", map { - my $v = ref($_) eq 'HASH' ? $_->{$name} : $_; - qq|| if $v; - } @$values + qq||; + } @values ); - qq|| if $options; + # onchange="alert(this.options[this.selectedIndex].value);" + $html = qq| + + | if $options; } else { - my $radio = join("\n", - map { - my $v = ref($_) eq 'HASH' ? $_->{$name} : $_; - qq|$v|; - } @$values + my $delimiter = $max_value_len > $self->input_step_size ? qq|
| : ''; + my $radio = +# $delimiter . + join("\n", + map { strip(qq| + + + $_ + + $delimiter + |) } @values ); - qq|
$radio
|; + $html = qq|
$radio
|; } + + return +# qq|| . + $html } foreach my $checkbox ( split(/\s+/, $default->{'frey-checkboxes'} ) ) { @@ -167,7 +194,7 @@ $attr->has_default ? $attr->default( $name ) : ''; - if ( ref($params_config) eq 'HASH' ) { + if ( ref($params_config) eq 'HASH' && defined $params_config->{$name} ) { $value = $params_config->{$name}; } elsif ( ref($params_config) eq 'ARRAY' ) { $value_html = select_values( $name, $attr_type, $params_config ); @@ -189,7 +216,7 @@ $default->{$name} = $value unless defined $default->{$name}; - my $size = ( int( length($value) / $self->input_resize_step ) + 1 ) * $self->input_resize_step; + my $size = ( int( length($value) / $self->input_step_size ) + 1 ) * $self->input_step_size; $value_html = qq|| unless $value_html; # warn "# required $name ", $class->meta->get_attribute( $name )->dump( 2 );