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/04/30 17:57:39 UTC

svn commit: r1098124 - in /perl/embperl/trunk/Embperl/Form: Control.pm Control/displaylink.pm Control/grid.pm Control/radio.pm Control/selectdyn.pm

Author: richter
Date: Sat Apr 30 15:57:38 2011
New Revision: 1098124

URL: http://svn.apache.org/viewvc?rev=1098124&view=rev
Log:
Change Embperl::Form to use jQuery and Ajax

Modified:
    perl/embperl/trunk/Embperl/Form/Control.pm
    perl/embperl/trunk/Embperl/Form/Control/displaylink.pm
    perl/embperl/trunk/Embperl/Form/Control/grid.pm
    perl/embperl/trunk/Embperl/Form/Control/radio.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=1098124&r1=1098123&r2=1098124&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control.pm Sat Apr 30 15:57:38 2011
@@ -365,6 +365,7 @@ $]
     my $span = $self->{width_percent} - $x ;
     my $addclass = '' ;
     my $style    = '' ;
+    my $ro = $self -> is_readonly ;
     if ($self -> {width_precent} && !$self -> {width})
         {
         $style = "width: " . int($self -> {width_precent} * 100 / 80) . '; '  ;
@@ -373,10 +374,11 @@ $]
         {
         $addclass = 'cControlBoxWidth' . ($self->{width} || 2 ) ;
         }
+    $addclass .= ' cControlReadonly' if ($ro) ;    
 $]
     <td class="cControlBox [+ $addclass +]" colspan="[+ $span +]" [$ if $style $]style="[+ $style +]"[$ endif $]>
     [*
-     my @ret = $self -> is_readonly?$self -> show_control_readonly($req):$self -> show_control ($req);
+     my @ret = $ro?$self -> show_control_readonly($req):$self -> show_control ($req);
      $self -> show_control_addons ($req) ;
      *]
     </td>

Modified: perl/embperl/trunk/Embperl/Form/Control/displaylink.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/displaylink.pm?rev=1098124&r1=1098123&r2=1098124&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/displaylink.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/displaylink.pm Sat Apr 30 15:57:38 2011
@@ -59,6 +59,7 @@ $displays  = [$displays] if (!ref $displ
 
 @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 ;
 
 my $dispn = 0 ;
 $]

Modified: perl/embperl/trunk/Embperl/Form/Control/grid.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/grid.pm?rev=1098124&r1=1098123&r2=1098124&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/grid.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/grid.pm Sat Apr 30 15:57:38 2011
@@ -258,11 +258,13 @@ $]
 
   my $fields = $self->{'fields'};
  $]
+         <thead>
          <tr class="cGridHeader">
          [$ foreach my $field (@$fields) $]
             <td class="cGridHeader" [$if($width = $field->{width})$]width="[+$width+]"[$endif$]>[+ $self -> form -> convert_label ($self, $field->{name}, $field->{text}) +]</td>
          [$ endforeach $]
          </tr>
+         </thead>
 [$ endsub $]
 
 [# ---------------------------------------------------------------------------
@@ -276,13 +278,16 @@ $]
     my $id     = $self -> {id};
     my $name   = $self -> {name} ;
     my $n      = 0 ;
+    my $gridro = $self -> is_readonly () ;
+    my $ro ;
     $]
 
     <tr class="cGridRow" id="[+ "$id-row-$i" +]">
         [$foreach $field (@$fields)$]
-            <td class="cGridCell">[$if $n++ == 0$]<input type="hidden" name="[+ "$name-#row#-$i" +]" value="[+ $i +]">[$endif$][-
+            [- $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-$field->{name}-$i" ;
-                if ($self -> {readonly})
+                if ($ro)
                     {
                     $field -> show_control_readonly ($req)
                     }
@@ -292,7 +297,7 @@ $]
                     }
                 -]</td>
         [$endforeach$]     
-    </tr>             
+    </tr>
 [$ endsub $]
              
 [# ---------------------------------------------------------------------------
@@ -308,9 +313,11 @@ $]
     my $max    = $fdat{"$name-max"} || 1 ;
     $]
 
+    <tbody>
     [* for ($i = 0; $i < $max ; $i++ ) { *]
         [- $self -> show_grid_table_row ($req, $i) ; -]
     [* } *]
+    </tbody>
     
 [$endsub$]
 

Modified: perl/embperl/trunk/Embperl/Form/Control/radio.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/radio.pm?rev=1098124&r1=1098123&r2=1098124&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/radio.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/radio.pm Sat Apr 30 15:57:38 2011
@@ -31,7 +31,7 @@ sub show_control_readonly
     {
     my ($self, $req) = @_ ;
 
-    my ($values, $options) = $self -> get_values ;
+    my ($values, $options) = $self -> get_values ($req) ;
     my $name     = $self -> {name} ;
     my $addtop   = $self -> {addtop} || [] ;
     my $addbottom= $self -> {addbottom} || [] ;
@@ -104,7 +104,7 @@ else
     }
 
 $]
-<table class="cRadioTab">[+ do { local $escmode = 0 ; $trglob }+]
+<table class="cRadioTab[+ $self -> is_readonly?' cControlReadonly':''+]">[+ do { local $escmode = 0 ; $trglob }+]
 [$ foreach $val (@$addtop) $]
     [$if !defined ($filter) || ($val->[0] =~ /$filter/i) $]
     [- $fdat{$name} = $val -> [0], $set = 0 if ($set) ; -]

Modified: perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm?rev=1098124&r1=1098123&r2=1098124&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm Sat Apr 30 15:57:38 2011
@@ -148,7 +148,7 @@ autocomplete_setup($( "#_inp_[+ $jsname 
                         datasrcurl:  '[+ do { local $escmode = 0 ; $self -> {datasrcurl} } +]',
                         datasrc:     '[+ $self->{datasrc} +]',
                         use_ajax:     '[+ $self->{use_ajax} +]',
-                        show_on_select: [+ $self->{show_on_select}?'true':'false' +],
+                        show_on_select: [+ $self->{show_on_select}?'true':'false' +]
                         }) ;
 </[$if $noscript $]x-[$endif$]script type="text/javascript">
 



---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org