Mailing List Archive

Author: richter
Date: Sun Apr 21 13:31:56 2013
New Revision: 1470299

URL: http://svn.apache.org/r1470299
Log:
Fix Form::Validate & datetime for multiple forms in same page

Modified:
perl/embperl/trunk/Embperl/Form.pm
perl/embperl/trunk/Embperl/Form/Control/datetime.pm
perl/embperl/trunk/Embperl/Form/Control/dynctrl.pm
perl/embperl/trunk/Embperl/Form/Control/tabs.pm
perl/embperl/trunk/Embperl/Form/Validate.pm

Modified: perl/embperl/trunk/Embperl/Form.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form.pm?rev=1470299&r1=1470298&r2=1470299&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form.pm (original)
+++ perl/embperl/trunk/Embperl/Form.pm Sun Apr 21 13:31:56 2013
@@ -356,6 +356,7 @@ sub new_controls
my $class = ref $self ;
local $options -> {disable} = $control -> {disables}[$i] ;
my $subform = $class -> sub_new ($subcontrols, $options, $ctlid, $validate_rules, $self -> {formptr}) ;
+ $subform -> {text} ||= $control -> {options}[$i] if (exists ($control -> {options}) && $control -> {options}[$i]) ;
push @ids, $ctlid ;
push @obj, $subform ;
$i++ ;
@@ -1030,7 +1031,7 @@ $]
<div id="[+ $self -> {unique_id} +]_[+ $self->{id} +]" class="ef-tabs-content"
[$if ($activeid && $self->{id} ne $activeid) $] style="display: none" [$endif$]
>
-[$if (!$self -> {noframe}) $]<table class="[+ $class +]"><tr><td class="ef-tabs-content-cell"> [$endif$]
+[$if (!$self -> {noframe}) $]<div class="ef-tabs-separator"> -> [+ $self -> {text} +]</div><table class="[+ $class +]"><tr><td class="ef-tabs-content-cell"> [$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=1470299&r1=1470298&r2=1470299&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/datetime.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/datetime.pm Sun Apr 21 13:31:56 2013
@@ -196,15 +196,17 @@ $]

<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$]
+[$if $self -> {maxlength} $]maxlength="[+ $self->{maxlength} +]"[$endif$]
+_ef_attach="ef_datetime" _ef_dynamic="[+ $self -> {dynamic}?'true':'' +]"
>
+[#
<script type="text/javascript">
$('#[+ $fullid +]').datepicker ({ showWeek: true,
[$if $self -> {dynamic} $]constrainInput: false, [$endif$]
showButtonPanel: true
}) ;
</script>
-
+#]

[$endsub$]


Modified: perl/embperl/trunk/Embperl/Form/Control/dynctrl.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/dynctrl.pm?rev=1470299&r1=1470298&r2=1470299&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/dynctrl.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/dynctrl.pm Sun Apr 21 13:31:56 2013
@@ -104,7 +104,7 @@ sub init_markup
die \@errors if ($rc) ;

#::dbg($ctrl, $output) ;
- $fdat -> {'_ctl_' . $name} = $output ;
+ $fdat -> {'_ctl_' . $name} = Encode::decode ('utf8', $output) ;
}



Modified: perl/embperl/trunk/Embperl/Form/Control/tabs.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/tabs.pm?rev=1470299&r1=1470298&r2=1470299&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/tabs.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/tabs.pm Sun Apr 21 13:31:56 2013
@@ -162,7 +162,7 @@ $]
}
*]
[$endwhile $]
- [$if ($j == @$values) $]<td class="ef-tabs-cell-blank">&nbsp;</td>[$endif$]
+ [$if ($j == @$values) $]<td class="ef-tabs-cell-blank ef-tabs-view-all">&nbsp;</td>[$endif$]
</tr></table>
[$endwhile$]
[#<input type="hidden" name="[+ $name +]" id="[+ $fullname +]" class="ef-field-tab_select" value="[+ $uid +]_[+ $activeid +]">#]

Modified: perl/embperl/trunk/Embperl/Form/Validate.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Validate.pm?rev=1470299&r1=1470298&r2=1470299&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Validate.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Validate.pm Sun Apr 21 13:31:56 2013
@@ -601,13 +601,13 @@ sub gather_script_code
}
if (!ref $key)
{
- $script .= "obj = document.$form\['$key'\] ; if (obj && !($code)) { $setmsg " . ($param{fail}?'fail=1;break;':($param{cont}?'':'break;')) . "}\n" ;
+ $script .= "obj = formelem\['$key'\] ; if (obj && !($code)) { $setmsg " . ($param{fail}?'fail=1;break;':($param{cont}?'':'break;')) . "}\n" ;
}
else
{
foreach my $k (@$keys)
{
- $script .= "obj = document.$form\['$k'\] ; if (obj && !($code)) {" ;
+ $script .= "obj = formelem\['$k'\] ; if (obj && !($code)) {" ;
}

$script .= " $setmsg " . ($param{fail}?'fail=1;break;':($param{cont}?'':'break;')) . "\n" ;
@@ -671,7 +671,7 @@ sub get_script_code

return qq{

-function epform_validate_$fname(return_msgs, failed_class)
+function epform_validate_$fname(return_msgs, failed_class, formelem)
{
var msgs = new Array ;
var ids = new Array ;
@@ -679,6 +679,9 @@ function epform_validate_$fname(return_m
var i = 0 ;
var obj ;

+ if (!formelem)
+ formelem = document.$fname ;
+
do {
$script ;
}
@@ -689,7 +692,7 @@ function epform_validate_$fname(return_m
var i ;
for (key in ids)
{
- var elems = document.$fname\[ids[key]\] ;
+ var elems = formelem\[ids[key]\] ;
if (elems)
{
if (!(elems instanceof NodeList))



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