X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yarrg%2Fweb%2Fqtextstring;h=93eb1249633499550bf763cb7c33ccd1c735115b;hp=639e9abf25bc3a3db06a091f776138e856c32092;hb=b003b70daab49984677a1cfadced9da9ee9be19a;hpb=742ec1631db983f22545c9c7d6d573865bdc85fa diff --git a/yarrg/web/qtextstring b/yarrg/web/qtextstring index 639e9ab..93eb124 100644 --- a/yarrg/web/qtextstring +++ b/yarrg/web/qtextstring @@ -40,14 +40,18 @@ $qa => $m->caller_args(1)->{'qa'} $dbh $thingstring $emsgstore -$perresult +$onresults $prefix => 'ts'; +$helpref => undef; <%perl> my $stringval= $qa->{$thingstring}; $stringval='' if !defined $stringval; my $p= $prefix.'_'; +my $checker= $m->fetch_comp("check_${thingstring}"); +my $significant_nonempty= $checker->attr_exists('significant_nonempty'); + <&| script &> @@ -57,7 +61,7 @@ my $p= $prefix.'_'; <%$p%>timeout=false; <%$p%>request=false; -<%$p%>done=''; +<%$p%>done=<% $significant_nonempty ? "null" : "''" %>; <%$p%>needed=''; function <%$p%>Later(){ window.clearTimeout(<%$p%>timeout); @@ -97,13 +101,13 @@ register_onload(<%$p%>Needed); id="<% $thingstring %>" name="<% $thingstring %>" onchange="<%$p%>Needed();" onkeyup="<%$p%>Later();" value="<% $stringval |h %>" - > + ><% defined($helpref) ? "[?]" : '' %>
 

<%perl> -if (length $thingstring) { - my ($emsg,$canonstring,$results)= $m->comp('qtextstringcheck', +if ($significant_nonempty || length $thingstring) { + my ($emsg,$canonstring,@results)= $m->comp('qtextstringcheck', what => $thingstring, ocean => $qa->{Ocean}, string => $stringval, @@ -113,10 +117,6 @@ if (length $thingstring) { $$emsgstore='' unless defined $$emsgstore; $$emsgstore .= $emsg. ' '; } - - foreach my $entry (@$results) { -#print STDERR "qts entry perresult \`@$entry'\n"; - $perresult->(@$entry); - } + $onresults->(@results); }