Merge branch 'master' into WebGUI8
This commit is contained in:
commit
2400f19099
797 changed files with 33894 additions and 27196 deletions
|
|
@ -82,6 +82,7 @@ sub finish {
|
|||
parent.location.href='%s';
|
||||
</script>
|
||||
EOJS
|
||||
local $| = 1;
|
||||
$self->session->output->print($text . $self->{_foot}, 1); # skipMacros
|
||||
return 'chunked';
|
||||
}
|
||||
|
|
@ -146,7 +147,8 @@ A message to be displayed in the status bar.
|
|||
|
||||
sub update {
|
||||
my $self = shift;
|
||||
my $message = shift; ##JS string escaping?
|
||||
my $message = shift;
|
||||
$message =~ s/'/\\'/g; ##Encode single quotes for JSON;
|
||||
$self->session->log->preventDebugOutput;
|
||||
$self->{_counter} += 1;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue