You are viewing a plain text version of this content. The canonical link for it is here.
Posted to embperl-cvs@perl.apache.org by ri...@apache.org on 2011/07/19 10:53:42 UTC
svn commit: r1148241 - in /perl/embperl/trunk/Embperl/Form: Control.pm
Control/display.pm Control/displaylink.pm Control/grid.pm Control/info.pm
Control/selectdyn.pm
Author: richter
Date: Tue Jul 19 08:53:40 2011
New Revision: 1148241
URL: http://svn.apache.org/viewvc?rev=1148241&view=rev
Log:
Use underscore in grid field names & add events to various controls
Modified:
perl/embperl/trunk/Embperl/Form/Control.pm
perl/embperl/trunk/Embperl/Form/Control/display.pm
perl/embperl/trunk/Embperl/Form/Control/displaylink.pm
perl/embperl/trunk/Embperl/Form/Control/grid.pm
perl/embperl/trunk/Embperl/Form/Control/info.pm
perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm
Modified: perl/embperl/trunk/Embperl/Form/Control.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control.pm?rev=1148241&r1=1148240&r2=1148241&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control.pm Tue Jul 19 08:53:40 2011
@@ -345,7 +345,11 @@ $]
# show_control_readonly - output the control as readonly
#]
-[$ sub show_control_readonly ($self, $req, $value) $][+ defined ($value)?$value:($self -> {value} || $fdat{$self -> {name}}) +][$endsub$]
+[$ sub show_control_readonly ($self, $req, $value, $class) $]
+[$if $class $]<span id="_inp_[+ $self -> {name} +]" class="[+$class+]">[$endif$]
+[+ defined ($value)?$value:($self -> {value} || $fdat{$self -> {name}}) +]
+[$if $class $]</span>[$endif$]
+[$endsub$]
[# ---------------------------------------------------------------------------
#
Modified: perl/embperl/trunk/Embperl/Form/Control/display.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/display.pm?rev=1148241&r1=1148240&r2=1148241&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/display.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/display.pm Tue Jul 19 08:53:40 2011
@@ -38,7 +38,7 @@ my $value = exists $self->{value} ? $sel
$value = [ split /\t/, $value ] if $self->{split};
$value = [ split /\n/, $value ] if $self->{splitlines};
-$]<span id="[+ $id +]">[$ if ref $value eq 'ARRAY' $][$ foreach $v (@$value) $][+ $v +]<br />[$ endforeach
+$]<span id="[+ $id +]" [+ do { local $escmode = 0 ; $self -> {eventattrs} } +]>[$ if ref $value eq 'ARRAY' $][$ foreach $v (@$value) $][+ $v +]<br />[$ endforeach
$][$ elsif ref $value eq 'HASH' $][$ foreach $k (keys %$value) $][+ $k +]: [+ $value->{$k} +]<br />[$ endforeach
$][$ elsif ref $value $]<em>[+ ref $value +]</em>[$
else $][+ $value +][$ endif $]</span>
Modified: perl/embperl/trunk/Embperl/Form/Control/displaylink.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/displaylink.pm?rev=1148241&r1=1148240&r2=1148241&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/displaylink.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/displaylink.pm Tue Jul 19 08:53:40 2011
@@ -57,19 +57,21 @@ $targets = [$targets] if ($targets &&
$opens = [$opens] if ($opens && !ref $opens) ;
$displays = [$displays] if (!ref $displays) ;
-@hrefs = map { my $x = $_ ; $x =~ s/%%(.+?)%%/$fdat{$1}/g ; $x } ref ($hrefs)?@$hrefs:($hrefs) ;
-@opens = map { my $x = $_ ; $x =~ s/%%(.+?)%%/$fdat{$1}/g ; $x } ref ($opens)?@$opens:($opens) ;
-@displays = map { my $x = $_ ; $x =~ s/%%(.+?)%%/$fdat{$1}/g ; $x } @$dispalys ;
+
+@hrefs = map { my $x = $_ ; $x =~ s/%%%name%%%/$fdat{$name}/g ; $x =~ s/%%(.+?)%%/$fdat{$1}/g ; $x } ref ($hrefs)?@$hrefs:($hrefs) ;
+@opens = map { my $x = $_ ; $x =~ s/%%%name%%%/$fdat{$name}/g ; $x =~ s/%%(.+?)%%/$fdat{$1}/g ; $x } ref ($opens)?@$opens:($opens) ;
+@displays = map { my $x = $_ ; $x =~ s/%%%name%%%/$fdat{$name}/g ; $x =~ s/%%(.+?)%%/$fdat{$1}/g ; $x } @$dispalys ;
my $dispn = 0 ;
$]
[$ foreach $display (@$displays) $]
[$if $opens[$dispn] $]
- <a href="#" onclick="[+ $opens[$dispn] +][$if $hrefs[$dispn] $]('[+ $hrefs[$dispn] +]')[$endif$]">
+ <a href="#" onclick="[+ $opens[$dispn] +][$if $hrefs[$dispn] $]('[+ $hrefs[$dispn] +]')[$endif$]" [+ do { local $escmode = 0 ; $self -> {eventattrs} } +]>
[$else$]
<a href="[+ do {local $escmode=0;$hrefs[$dispn]} +]"
- [$if $targets -> [$dispn] $]target="[+ $targets -> [$dispn] +]"[$endif$]>
+ [$if $targets -> [$dispn] $]target="[+ $targets -> [$dispn] +]"[$endif$]
+ [+ do { local $escmode = 0 ; $self -> {eventattrs} } +]>
[$endif$][+ $showoptions?$display:$form -> convert_text ($self, $display) +]</a>
[- $dispn++ -]
[$endforeach$]
Modified: perl/embperl/trunk/Embperl/Form/Control/grid.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/grid.pm?rev=1148241&r1=1148240&r2=1148241&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/grid.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/grid.pm Tue Jul 19 08:53:40 2011
@@ -90,10 +90,10 @@ sub init_data
foreach my $field (@$fields)
{
$col = exists $field -> {col}?$field -> {col}:$j ;
- $fdat->{"$name-$j-$i"} = $data->[$col] ;
+ $fdat->{"${name}_${j}_$i"} = $data->[$col] ;
if ($field -> can ('init_data'))
{
- local $field->{name} = "$name-$j-$i" ;
+ local $field->{name} = "${name}_${j}_$i" ;
$field -> init_data ($req, $self) ;
}
$j++ ;
@@ -147,7 +147,7 @@ sub prepare_fdat
{
if ((ref ($field) =~ /::/) && $field -> can ('prepare_fdat'))
{
- local $field->{name} = "$name-$j-$i" ;
+ local $field->{name} = "${name}_${j}_$i" ;
$field -> prepare_fdat ($req) ;
}
$ok++ ;
@@ -172,7 +172,7 @@ sub prepare_fdat
foreach my $field (@$fields)
{
$col = exists $field -> {col}?$field -> {col}:$j ;
- $data[$col+1] = $fdat->{"$name-$j-$i"} ;
+ $data[$col+1] = $fdat->{"${name}_${j}_$i"} ;
$j++ ;
}
$val = $ldap?ecos::LdapBase -> joinAttrValue(\@data):\@data ;
@@ -299,7 +299,7 @@ $]
[$foreach $field (@$fields)$]
[- $ro = $gridro || $field -> is_readonly ; -]
<td class="[+ $ro?'cGridCellReadonly':'cGridCell' +]">[$if $n++ == 0$]<input type="hidden" name="[+ "$name-#row#-$i" +]" value="[+ $i +]">[$endif$][-
- local $field -> {name} = "$name-$j-$i" ;
+ local $field -> {name} = "${name}_${j}_$i" ;
if ($ro)
{
$field -> show_control_readonly ($req)
Modified: perl/embperl/trunk/Embperl/Form/Control/info.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/info.pm?rev=1148241&r1=1148240&r2=1148241&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/info.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/info.pm Tue Jul 19 08:53:40 2011
@@ -35,7 +35,7 @@ __EMBPERL__
my $span = ($self->{width_percent});
my $section = $self->{section};
$]
-<td class="cBase cInfoBox" colspan="[+ $span +]">[$ if $section $]<b>[$ endif $][+ $self -> {showtext}?($self->{text}):$self -> form -> convert_text ($self) +] [$ if $section $]</b>[$ endif $]</td>
+<td class="cBase cInfoBox" colspan="[+ $span +]" [+ do { local $escmode = 0 ; $self -> {eventattrs} } +]>[$ if $section $]<b>[$ endif $][+ $self -> {showtext}?($self->{text}):$self -> form -> convert_text ($self) +] [$ if $section $]</b>[$ endif $]</td>
[$endsub$]
Modified: perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm?rev=1148241&r1=1148240&r2=1148241&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm Tue Jul 19 08:53:40 2011
@@ -49,8 +49,8 @@ sub show_control_readonly
}
$self -> {value} = $initval ;
+ $self -> SUPER::show_control_readonly ($req, undef, 'cControlReadonlyLink') ;
$self -> show_hidden ($req) ;
- $self -> SUPER::show_control_readonly ($req) ;
}
@@ -74,12 +74,23 @@ __EMBPERL__
# show_hidden - out hidden field
#]
-[$ sub show_hidden ($self, $req) $]
-<input type="hidden" name="[+ $self -> {name} +]">
+[$ sub show_hidden ($self, $req)
+my $noscript = $req -> {epf_no_script} ;
+$]
+<input type="hidden" name="[+ $self -> {name} +]" id="[+ $self -> {name} +]">
+<[$if $noscript $]x-[$endif$]script type="text/javascript">
+control_link_setup($( "#_inp_[+ $self -> {name} +]" ), {
+ showurl: '[+ do { local $escmode = 0 ; $self -> {showurl} } +]',
+ popupurl: '[+ do { local $escmode = 0 ; $self -> {popupurl} } +]',
+ use_ajax: '[+ $self->{use_ajax} +]',
+ }) ;
+</[$if $noscript $]x-[$endif$]script >
+
[$endsub$]
+
[# ---------------------------------------------------------------------------
#
# show_control - output the control
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org