Author: richter
Date: Fri Sep 19 04:44:38 2014
New Revision: 1626123
URL: http://svn.apache.org/r1626123
Log:
Allow multiple state to combine
Modified:
perl/embperl/trunk/Embperl/Form/Control.pm
perl/embperl/trunk/Embperl/Form/ControlMultValue.pm
Modified: perl/embperl/trunk/Embperl/Form/Control.pm
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control.pm?rev=1626123&r1=1626122&r2=1626123&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control.pm Fri Sep 19 04:44:38 2014
@@ -120,7 +120,7 @@ sub is_readonly
my ($self, $req) = @_ ;
my $readonly = $self -> {readonly} || $req ->
{form_options_masks}{$self->{name}}{readonly} || $req ->
{form_options_masks}{'*'}{readonly} ;
- $readonly = &{$readonly}($req) if (ref ($readonly) eq 'CODE') ;
+ $readonly = &{$readonly}($self, $req) if (ref ($readonly) eq 'CODE') ;
return $readonly ;
}
Modified: perl/embperl/trunk/Embperl/Form/ControlMultValue.pm
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/ControlMultValue.pm?rev=1626123&r1=1626122&r2=1626123&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/ControlMultValue.pm (original)
+++ perl/embperl/trunk/Embperl/Form/ControlMultValue.pm Fri Sep 19 04:44:38 2014
@@ -378,7 +378,9 @@ my $id = $self -> get_id_from_value (
my $name = $self -> {force_name} || $self -> {name} ;
$]
<div [+ do { local $escmode = 0 ; $self -> get_std_control_attr($req, '',
'readonly', 'ef-control-with-id') } +] _ef_divname="_opt_[+ $name +]">[+ $text
+]</div>
-[$ if $self->{hidden} $]
+[$ if $self->{trigger} $]
+<span style='display: none'>[- $self -> show_control ($req) -]</span>
+[$ elsif $self->{hidden} $]
<input type="hidden" name="[+ $name +]" value="[+ $value +]">
[$endif$]
<input type="hidden" name="_id_[+ $name +]" value="[+ $id +]">
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscr...@perl.apache.org
For additional commands, e-mail: embperl-cvs-h...@perl.apache.org
