richter at apache
Apr 15, 2012, 10:24 PM
Views: 164
Permalink
|
|
svn commit: r1326486 - in /perl/embperl/trunk/Embperl: ./ Form/ Form/Control/
|
|
Author: richter
Date: Mon Apr 16 05:24:55 2012
New Revision: 1326486
URL: http://svn.apache.org/viewvc?rev=1326486&view=rev
Log:
Place unique id in instead of form object
Modified:
perl/embperl/trunk/Embperl/Form.pm
perl/embperl/trunk/Embperl/Form/Control.pm
perl/embperl/trunk/Embperl/Form/Control/checkbox.pm
perl/embperl/trunk/Embperl/Form/Control/datetime.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/icon.pm
perl/embperl/trunk/Embperl/Form/Control/info.pm
perl/embperl/trunk/Embperl/Form/Control/input.pm
perl/embperl/trunk/Embperl/Form/Control/mult.pm
perl/embperl/trunk/Embperl/Form/Control/number.pm
perl/embperl/trunk/Embperl/Form/Control/password.pm
perl/embperl/trunk/Embperl/Form/Control/radio.pm
perl/embperl/trunk/Embperl/Form/Control/select.pm
perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm
perl/embperl/trunk/Embperl/Form/Control/tabs.pm
perl/embperl/trunk/Embperl/Form/Control/textarea.pm
Modified: perl/embperl/trunk/Embperl/Form.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form.pm?rev=1326486&r1=1326485&r2=1326486&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form.pm (original)
+++ perl/embperl/trunk/Embperl/Form.pm Mon Apr 16 05:24:55 2012
@@ -77,16 +77,6 @@ sub sub_new
$Embperl::FormData::forms{$self -> {formptr}} = $self ;
$Embperl::FormData::forms{$self -> {formptr}} = $self ;
- if ($toplevel)
- {
- $self -> {unique_id} = $self -> {formptr} =~ /HASH/?'_' . $$ . '_' . $form_cnt++:$self -> {formptr} ;
- $self -> {unique_id} =~ s/[^a-z0-9_]/_/g ;
- }
- else
- {
- $self -> {unique_id} = $self -> parent_form -> {unique_id} ;
- }
-
if (!$validate_rules)
{
$validate_rules = $self -> {validate_rules} = [] ;
@@ -510,6 +500,7 @@ sub show_controls
if ($self -> {toplevel})
{
$req -> {form_options_masks} = ($options && $options -> {masks}) || {} ;
+ $req -> {uuid} ||= $form_cnt++ ;
}
my $lines = $self -> {layout} ;
my %n ;
Modified: perl/embperl/trunk/Embperl/Form/Control.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control.pm?rev=1326486&r1=1326485&r2=1326486&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control.pm Mon Apr 16 05:24:55 2012
@@ -201,7 +201,7 @@ sub get_control_from_id
sub get_id_for_control
{
- my ($self) = @_ ;
+ my ($self, $reqdata) = @_ ;
return "$self->{formptr}#$self->{id}" ;
}
@@ -287,7 +287,7 @@ sub get_value
sub get_std_control_attr
{
- my ($self, $id, $type, $addclass) = @_ ;
+ my ($self, $req, $id, $type, $addclass) = @_ ;
my $name = $self -> {force_name} || $self -> {name} ;
my $ctrlid = $id || $name ;
@@ -405,7 +405,7 @@ $]
# show_control - output the control itself
#]
-[$ sub show_control ($self, $req) $]<div [.+ do { local $escmode = 0 ; $self -> get_std_control_attr() } +]>[+ $self->{value} +]</div>[$endsub$]
+[$ sub show_control ($self, $req) $]<div [.+ do { local $escmode = 0 ; $self -> get_std_control_attr($req) } +]>[+ $self->{value} +]</div>[$endsub$]
[# ---------------------------------------------------------------------------
#
@@ -416,7 +416,7 @@ $]
$value = $self -> {value} || $fdat{$self -> {name}} if (!defined($value)) ;
$]
-<div [.+ do { local $escmode = 0 ; $self -> get_std_control_attr('', 'readonly') } +]>[+ $value +]</div>
+<div [.+ do { local $escmode = 0 ; $self -> get_std_control_attr($req, '', 'readonly') } +]>[+ $value +]</div>
[$endsub$]
[# ---------------------------------------------------------------------------
Modified: perl/embperl/trunk/Embperl/Form/Control/checkbox.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/checkbox.pm?rev=1326486&r1=1326485&r2=1326486&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/checkbox.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/checkbox.pm Mon Apr 16 05:24:55 2012
@@ -78,7 +78,7 @@ __EMBPERL__
# show_control - output the control
#]
-[.$ sub show_control ($self)
+[.$ sub show_control ($self, $req)
my $name = $self -> {name} ;
my $val = $self -> {value} || 1 ;
@@ -89,7 +89,7 @@ __EMBPERL__
push @{$self -> form -> {fields2empty}}, $name ;
$]
-<input type="checkbox" name="[+ $self -> {force_name} || $self -> {name} +]" [.+ do { local $escmode = 0 ; $self -> get_std_control_attr() } +] value="[+ $val +]"
+<input type="checkbox" name="[+ $self -> {force_name} || $self -> {name} +]" [.+ do { local $escmode = 0 ; $self -> get_std_control_attr($req) } +] value="[+ $val +]"
[$if ($self -> {sublines} || $self -> {subobjects}) $] OnClick="[+ $nsprefix +]show_checked(document, this)" [$endif$]
>[$if ($self -> {trigger}) $]<script >$('#[+ $self -> {name} +]').ef_checkbox ()</script>[$endif$]
[$endsub$]
Modified: perl/embperl/trunk/Embperl/Form/Control/datetime.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/datetime.pm?rev=1326486&r1=1326485&r2=1326486&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/datetime.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/datetime.pm Mon Apr 16 05:24:55 2012
@@ -160,10 +160,10 @@ __EMBPERL__
$self -> {size} ||= 80 / ($self -> {width} || 2) ;
my $class = $self -> {class} ||= '' ;
-my $fullid = $self -> form -> {unique_id} . '_' . $self ->{id} ;
+my $fullid = $req -> {uuid} . '_' . $self ->{id} ;
$]
-<input type="text" name="[+ $self -> {force_name} || $self -> {name} +]" [.+ do { local $escmode = 0 ; $self -> get_std_control_attr($fullid) } +]
+<input type="text" name="[+ $self -> {force_name} || $self -> {name} +]" [.+ do { local $escmode = 0 ; $self -> get_std_control_attr($req, $fullid) } +]
[$if $self -> {size} $]size="[+ $self->{size} +]"[$endif$]
[$if $self -> {maxlength} $]maxlength="[+ $self->{maxlength} +]"[$endif$]
>
Modified: perl/embperl/trunk/Embperl/Form/Control/display.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/display.pm?rev=1326486&r1=1326485&r2=1326486&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/display.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/display.pm Mon Apr 16 05:24:55 2012
@@ -30,7 +30,7 @@ __EMBPERL__
# show_control - output the control
#]
-[.$ sub show_control ($self)
+[.$ sub show_control ($self, $req)
my $name = $self->{name};
my $id = $self->{id};
@@ -38,7 +38,7 @@ my $value = exists $self->{value} ? $sel
$value = [ split /\t/, $value ] if $self->{split};
$value = [ split /\n/, $value ] if $self->{splitlines};
-$]<div [.+ do { local $escmode = 0 ; $self -> get_std_control_attr('', 'readonly') } +]>[$ if ref $value eq 'ARRAY' $][$ foreach $v (@$value) $][+ $v +]<br />[$ endforeach
+$]<div [.+ do { local $escmode = 0 ; $self -> get_std_control_attr($req, '', 'readonly') } +]>[$ 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 $]</div>
Modified: perl/embperl/trunk/Embperl/Form/Control/displaylink.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/displaylink.pm?rev=1326486&r1=1326485&r2=1326486&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/displaylink.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/displaylink.pm Mon Apr 16 05:24:55 2012
@@ -64,7 +64,7 @@ $displays = [$displays] if (!ref $displ
my $dispn = 0 ;
$]
-<div [.+ do { local $escmode = 0 ; $self -> get_std_control_attr('', 'readonly') } +]>
+<div [.+ do { local $escmode = 0 ; $self -> get_std_control_attr($req, '', 'readonly') } +]>
[$ foreach $display (@displays) $]
[$if $opens[$dispn] $]
<a href="#" onclick="[+ $opens[$dispn] +][$if $hrefs[$dispn] $]('[+ $hrefs[$dispn] +]')[$endif$]" [.+ do { local $escmode = 0 ; $self -> {eventattrs} } +]>
Modified: perl/embperl/trunk/Embperl/Form/Control/grid.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/grid.pm?rev=1326486&r1=1326485&r2=1326486&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/grid.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/grid.pm Mon Apr 16 05:24:55 2012
@@ -261,7 +261,7 @@ __EMBPERL__
my $nsprefix = $self -> form -> {jsnamespace} ;
my $max = $fdat{"__${name}_max"} ;
my $on_grid_change = $self -> {on_grid_change} ;
- $self -> {fullid} = $self -> form -> {unique_id} . '_' . $self -> {id} ;
+ $self -> {fullid} = $req -> {uuid} . '_' . $self -> {id} ;
$]<table class="ef-element ef-element-width-[+ $self -> {width_percent} +][+ ' ' +][+ $self -> {state} +]">
<tr>
<td class="ui-label-box" colspan="[+ $span +]">
Modified: perl/embperl/trunk/Embperl/Form/Control/icon.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/icon.pm?rev=1326486&r1=1326485&r2=1326486&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/icon.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/icon.pm Mon Apr 16 05:24:55 2012
@@ -30,7 +30,7 @@ __EMBPERL__
# show - output the control
#]
-[.$ sub show ($self, $data)
+[.$ sub show ($self, $req)
my $span = ($self->{width_percent});
my $section = $self->{section};
@@ -38,7 +38,7 @@ my $class = $self -> {class} ;
$]<table class="ef-element ef-element-width-[+ $self -> {width_percent} +] ef-element-[+ $self -> {type} +]">
<tr>
<td class="ef-control-box">
- <div [.+ do { local $escmode = 0 ; $self -> get_std_control_attr() } +]>
+ <div [.+ do { local $escmode = 0 ; $self -> get_std_control_attr($req) } +]>
<span class="ui-icon ui-icon-[+ $self -> {icon} +] ef-icon" title="[+ $self -> {showtext}?($self->{text}):$self -> form -> convert_text ($self) +]"></span>
</div>
</td>
Modified: perl/embperl/trunk/Embperl/Form/Control/info.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/info.pm?rev=1326486&r1=1326485&r2=1326486&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/info.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/info.pm Mon Apr 16 05:24:55 2012
@@ -30,14 +30,14 @@ __EMBPERL__
# show - output the control
#]
-[.$ sub show ($self, $data)
+[.$ sub show ($self, $req)
my $span = ($self->{width_percent});
my $section = $self->{section};
my $class = $self -> {class} ;
$]<table class="ef-element ef-element-width-[+ $self -> {width_percent} +]">
<tr>
-<td class="do { local $escmode = 0 ; $self -> get_std_control_attr('', 'readonly') }">[$ if $section $]<b>[$ endif $][$ if $self -> {image} $]<img class="cControlButtonSymbol" src="[+ $self -> {image} +]">[$endif$][+ $self -> {showtext}?($self->{text}):$self -> form -> convert_text ($self) +] [$ if $section $]</b>[$ endif $]</td>
+<td class="do { local $escmode = 0 ; $self -> get_std_control_attr($req, '', 'readonly') }">[$ if $section $]<b>[$ endif $][$ if $self -> {image} $]<img class="cControlButtonSymbol" src="[+ $self -> {image} +]">[$endif$][+ $self -> {showtext}?($self->{text}):$self -> form -> convert_text ($self) +] [$ if $section $]</b>[$ endif $]</td>
</tr>
</table>[$endsub$]
Modified: perl/embperl/trunk/Embperl/Form/Control/input.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/input.pm?rev=1326486&r1=1326485&r2=1326486&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/input.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/input.pm Mon Apr 16 05:24:55 2012
@@ -30,12 +30,12 @@ __EMBPERL__
# show_control - output the control
#]
-[$ sub show_control ($self)
+[$ sub show_control ($self, $req)
#$self -> {size} ||= 80 / ($self -> {width} || 2) ;
my $class = $self -> {class} ;
$]
-<input type="text" name="[+ $self -> {force_name} || $self -> {name} +]" [.+ do { local $escmode = 0 ; $self -> get_std_control_attr() } +]
+<input type="text" name="[+ $self -> {force_name} || $self -> {name} +]" [.+ do { local $escmode = 0 ; $self -> get_std_control_attr($req) } +]
[$if $self -> {size} $]size="[+ $self->{size} +]"[$endif$]
[$if $self -> {maxlength} $]maxlength="[+ $self->{maxlength} +]"[$endif$]
>
Modified: perl/embperl/trunk/Embperl/Form/Control/mult.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/mult.pm?rev=1326486&r1=1326485&r2=1326486&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/mult.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/mult.pm Mon Apr 16 05:24:55 2012
@@ -114,7 +114,7 @@ sub prepare_fdat
sub show
{
- $_[0] -> {fullid} = $_[0] -> form -> {unique_id} . '_' . $_[0] -> {id} ;
+ $_[0] -> {fullid} = $_[1] -> {uuid} . '_' . $_[0] -> {id} ;
Embperl::Form::Control::show (@_)
}
@@ -154,7 +154,7 @@ $]
$fdat{$name} = $self -> {default} if ($fdat{$name} eq '' && exists ($self -> {default})) ;
my $span = 0 ;
-]
- <div [.+ do { local $escmode = 0 ; $self -> get_std_control_attr() } +]>
+ <div [.+ do { local $escmode = 0 ; $self -> get_std_control_attr($req) } +]>
<input type="hidden" name="__[+ $self -> {name} +]_max" id="__[+ $self -> {fullid} +]_max">
<table class="ef-control-mult-table" id="[+ $self -> {fullid} +]">
[- $self -> show_grid_table ($req) ; -]
Modified: perl/embperl/trunk/Embperl/Form/Control/number.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/number.pm?rev=1326486&r1=1326485&r2=1326486&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/number.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/number.pm Mon Apr 16 05:24:55 2012
@@ -25,9 +25,9 @@ use Embperl::Inline ;
sub get_std_control_attr
{
- my ($self, $id, $type, $addclass) = @_ ;
+ my ($self, $req, $id, $type, $addclass) = @_ ;
- return $self -> SUPER::get_std_control_attr ($id, $type, $type eq 'readonly'?'ef-control-number-readonly':$addclass) ;
+ return $self -> SUPER::get_std_control_attr ($req, $id, $type, $type eq 'readonly'?'ef-control-number-readonly':$addclass) ;
}
Modified: perl/embperl/trunk/Embperl/Form/Control/password.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/password.pm?rev=1326486&r1=1326485&r2=1326486&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/password.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/password.pm Mon Apr 16 05:24:55 2012
@@ -30,9 +30,9 @@ __EMBPERL__
# show_control - output the control
#]
-[$ sub show_control ($self) $]
+[$ sub show_control ($self, $req) $]
-<input type="password" name="[+ $self -> {force_name} || $self -> {name} +]" [.+ do { local $escmode = 0 ; $self -> get_std_control_attr() } +]
+<input type="password" name="[+ $self -> {force_name} || $self -> {name} +]" [.+ do { local $escmode = 0 ; $self -> get_std_control_attr($req) } +]
[$if $self -> {size} $]size="[+ $self->{size} +]"[$endif$]
[$if $self -> {maxlength} $]size="[+ $self->{maxlength} +]"[$endif$]
>
Modified: perl/embperl/trunk/Embperl/Form/Control/radio.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/radio.pm?rev=1326486&r1=1326485&r2=1326486&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/radio.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/radio.pm Mon Apr 16 05:24:55 2012
@@ -72,7 +72,7 @@ $]
[$ foreach $val (@$values) $][- $x = ($val =~ /$filter/i) -]
[.- $fdat{$name} = $val, $set = 0 if ($set) ;
$fdat{$name} = $val if ($ignorecase && lc($fdat{$name}) eq lc($val)) ; -]
- [+ do { local $escmode = 0 ; $tr }+]<td><input type="radio" name="[+ $self -> {force_name} || $self -> {name} +]" [.+ do { local $escmode = 0 ; $self -> get_std_control_attr() } +] value="[+ $val +]" id="[+ "$name-_-$val" +]"
+ [+ do { local $escmode = 0 ; $tr }+]<td><input type="radio" name="[+ $self -> {force_name} || $self -> {name} +]" [.+ do { local $escmode = 0 ; $self -> get_std_control_attr($req) } +] value="[+ $val +]" id="[+ "$name-_-$val" +]"
[$if ($self -> {sublines} || $self -> {subobjects}) $] OnClick="[+ $nsprefix +]show_radio_checked(document, this,[+ $i +],[+ $max +])" [$endif$]
></td><td>[+ $options ->[$i] || $val +]</td>[+ do { local $escmode = 0 ; $trend }+]
[* $i++ ; *]
Modified: perl/embperl/trunk/Embperl/Form/Control/select.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/select.pm?rev=1326486&r1=1326485&r2=1326486&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/select.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/select.pm Mon Apr 16 05:24:55 2012
@@ -52,7 +52,7 @@ __EMBPERL__
my ($values, $options) = $self -> get_all_values ($req) ;
$]
-<select name="[+ $self -> {force_name} || $self -> {name} +]" [+ $self->{multiple}?'multiple':''+] [.+ do { local $escmode = 0 ; $self -> get_std_control_attr() } +]
+<select name="[+ $self -> {force_name} || $self -> {name} +]" [+ $self->{multiple}?'multiple':''+] [.+ do { local $escmode = 0 ; $self -> get_std_control_attr($req) } +]
[$if ($self -> {sublines} || $self -> {subobjects}) $] OnChange="[+ $nsprefix +]show_selected(document, this)" [$endif$]
[$if ($self -> {rows}) $] size="[+ $self->{rows} +]" [$endif$]
>
Modified: perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm?rev=1326486&r1=1326485&r2=1326486&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm Mon Apr 16 05:24:55 2012
@@ -26,18 +26,18 @@ use Embperl::Inline ;
sub get_std_control_attr
{
- my ($self, $id, $type, $addclass) = @_ ;
+ my ($self, $req, $id, $type, $addclass) = @_ ;
if ($type eq 'readonly')
{
- $id = $self -> form -> {unique_id} . '_' . $self -> {name} ;
+ $id = $req -> {uuid} . '_' . $self -> {name} ;
my $url = $self -> {showurl} ;
$url =~ s/%id%/$self -> get_id_from_value ($Embperl::fdat{$self -> {name}})/e ;
- my $attr = $self -> SUPER::get_std_control_attr ($id, $type, 'ef-control-selectdyn-readonly') ;
+ my $attr = $self -> SUPER::get_std_control_attr ($req, $id, $type, 'ef-control-selectdyn-readonly') ;
return $attr . qq{ onDblClick="\$('#$self->{use_ajax}').ef_document ('load', '$url');"} ;
}
- return $self -> SUPER::get_std_control_attr ($id, $type, $addclass) ;
+ return $self -> SUPER::get_std_control_attr ($req, $id, $type, $addclass) ;
}
# ------------------------------------------------------------------------------------------
@@ -77,7 +77,7 @@ __EMBPERL__
[.$ sub show_control_readonly ($self, $req, $value)
-my $id = $self -> form -> {unique_id} . '_' . $self -> {name} ;
+my $id = $req -> {uuid} . '_' . $self -> {name} ;
my $url = $self -> {popupurl} ;
$url =~ s/%id%/$self -> get_id_from_value ($Embperl::fdat{$self -> {name}})/e ;
@@ -122,7 +122,7 @@ control_link_setup($( "#_inp_[+ $self ->
#my $addbottom= $self -> {addbottom} || [] ;
my $noscript = $req -> {epf_no_script} ;
my $nsprefix = $self -> form -> {jsnamespace} ;
- my $jsname = $self -> form -> {unique_id} . '_' . $name ;
+ my $jsname = $req -> {uuid} . '_' . $name ;
if ($noscript)
{
$jsname =~ s/[^a-zA-Z0-9%]/_/g ;
@@ -154,7 +154,7 @@ control_link_setup($( "#_inp_[+ $self ->
$]
<div class="ui-widget">
[# --- input --- #]
-<input name="_inp_[+ $name +]" [.+ do { local $escmode = 0 ; $self -> get_std_control_attr("_inp_$jsname") } +] type="text"
+<input name="_inp_[+ $name +]" [.+ do { local $escmode = 0 ; $self -> get_std_control_attr($req, "_inp_$jsname") } +] type="text"
[$if $self -> {size} $]size="[+ $self->{size} +]"[$endif$]
value="[+ $initval +]"
>
Modified: perl/embperl/trunk/Embperl/Form/Control/tabs.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/tabs.pm?rev=1326486&r1=1326485&r2=1326486&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/tabs.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/tabs.pm Mon Apr 16 05:24:55 2012
@@ -107,7 +107,7 @@ __EMBPERL__
my $activeid = $self -> get_active_id ($req) ;
my $form = $self -> form ;
my $nsprefix = $form -> {jsnamespace} ;
- my $uid = $form -> {unique_id} ;
+ my $uid = $req -> {uuid} ;
my $fullname = $uid . '_' . $name ;
my $tabs_per_line = $self -> {'tabs_per_line'} || 99;
$tabs_per_line = [$tabs_per_line, $tabs_per_line, $tabs_per_line, $tabs_per_line]
Modified: perl/embperl/trunk/Embperl/Form/Control/textarea.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/textarea.pm?rev=1326486&r1=1326485&r2=1326486&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/textarea.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/textarea.pm Mon Apr 16 05:24:55 2012
@@ -30,11 +30,11 @@ __EMBPERL__
# show_control - output the control
#]
-[.$ sub show_control ($self)
+[.$ sub show_control ($self, $req)
my $class = $self -> {class} ||= '' ;
$]
-<textarea type="text" name="[+ $self -> {force_name} || $self -> {name} +]" [.+ do { local $escmode = 0 ; $self -> get_std_control_attr() } +]
+<textarea type="text" name="[+ $self -> {force_name} || $self -> {name} +]" [.+ do { local $escmode = 0 ; $self -> get_std_control_attr($req) } +]
[# [$if $self -> {cols} $]cols="[+ $self->{cols} +]"[$endif$] #]
[$if $self -> {rows} $]rows="[+ $self->{rows} +]"[$endif$]
></textarea>
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe [at] perl
For additional commands, e-mail: embperl-cvs-help [at] perl
|
svn commit: r1326486 - in /perl/embperl/trunk/Embperl: ./ Form/ Form/Control/